Commit c1afcd08 authored by John Esmet's avatar John Esmet Committed by Yoni Fogel

[t:4963] fix another issue with reference counting in lock trees. we should...

[t:4963] fix another issue with reference counting in lock trees. we should not store a lock tree object in the manager if its reference count is zero, too many cases to deal with toku_ltm_get_lt. instead, atomically check if a lt's ref is 1 and remove it from the manager, so no race can occur between removing and adding another reference.


git-svn-id: file:///svn/toku/tokudb@44661 c7de825b-a66e-492c-adef-691d508d4ae1
parent a82a6c69
...@@ -2113,8 +2113,10 @@ cleanup: ...@@ -2113,8 +2113,10 @@ cleanup:
void void
toku_lt_add_ref(toku_lock_tree* tree) { toku_lt_add_ref(toku_lock_tree* tree) {
assert(tree); assert(tree);
lt_mutex_lock(tree);
assert(tree->ref_count > 0); assert(tree->ref_count > 0);
(void) __sync_add_and_fetch(&tree->ref_count, 1); tree->ref_count++;
lt_mutex_unlock(tree);
} }
static void static void
...@@ -2127,27 +2129,49 @@ ltm_stop_managing_lt_unlocked(toku_ltm* mgr, toku_lock_tree* tree) { ...@@ -2127,27 +2129,49 @@ ltm_stop_managing_lt_unlocked(toku_ltm* mgr, toku_lock_tree* tree) {
} }
int int
toku_lt_remove_ref(toku_lock_tree* tree) { toku_lt_remove_ref(toku_lock_tree *tree) {
int r = ENOSYS; int r = 0;
assert(tree); bool do_close = false;
// the following check is necessary to remove the lt, but not
// sufficient. this will only tell us if we can bail out quickly
// or if we have to keep going to do the actual expensive check
// which includes taking the lt mgr lock (bigger lock)
lt_mutex_lock(tree);
assert(tree->ref_count > 0); assert(tree->ref_count > 0);
uint32_t ref_count = __sync_sub_and_fetch(&tree->ref_count, 1); if (tree->ref_count > 1) {
if (ref_count > 0) { // this reference cannot possibly be the last, so we just
r = 0; // do the decrement and get out.
goto cleanup; tree->ref_count--;
lt_mutex_unlock(tree);
goto cleanup;
} }
lt_mutex_unlock(tree);
// now, get the manager lock and the tree lock, in that order.
ltm_mutex_lock(tree->mgr); ltm_mutex_lock(tree->mgr);
// Once the last reference was removed, only toku_ltm_get_lt could add a reference lt_mutex_lock(tree);
// and requires the ltm_mutex_lock. Prevent race condition by checking again. // if the ref count is still 1, then we definitely have the last
ref_count = tree->ref_count; // reference and can remove the lock tree. we know we have the last
if (ref_count == 0) { // because toku_ltm_get_lt holds the mgr mutex and add/remove ref
// holds the tree mutex.
assert(tree->ref_count > 0);
if (tree->ref_count == 1) {
assert(tree->dict_id.dictid != DICTIONARY_ID_NONE.dictid); assert(tree->dict_id.dictid != DICTIONARY_ID_NONE.dictid);
ltm_stop_managing_lt_unlocked(tree->mgr, tree); ltm_stop_managing_lt_unlocked(tree->mgr, tree);
r = 0; do_close = true;
} }
lt_mutex_unlock(tree);
ltm_mutex_unlock(tree->mgr); ltm_mutex_unlock(tree->mgr);
if (ref_count == 0) {
// for speed, do the actual close without holding any locks.
// the tree is not in the manager, no one else can get to it.
// so this is safe.
if (do_close) {
r = toku_lt_close(tree); r = toku_lt_close(tree);
} else {
r = 0;
} }
cleanup: cleanup:
return r; return r;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment