Commit 67548a08 authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

[t:4070], restore cachetable_wait_checkpoint

git-svn-id: file:///svn/toku/tokudb@38404 c7de825b-a66e-492c-adef-691d508d4ae1
parent dbb7a7e7
......@@ -1824,6 +1824,7 @@ static void checkpoint_dependent_pairs(
// and if the pair is pending a checkpoint, it needs to be written out
if (dependent_dirty[i]) curr_dep_pair->dirty = CACHETABLE_DIRTY;
if (curr_dep_pair->checkpoint_pending) {
cachetable_wait_checkpoint++;
write_locked_pair_for_checkpoint(ct, curr_dep_pair);
}
}
......@@ -2175,7 +2176,7 @@ int toku_cachetable_get_and_pin_with_dep_pairs (
);
assert(p);
nb_mutex_write_lock(&p->nb_mutex, ct->mutex);
uint64_t t0 = get_tnow();
uint64_t t0 = get_tnow();
// Retrieve the value of the PAIR from disk.
// The pair being fetched will be marked as pending if a checkpoint happens during the
......@@ -2216,6 +2217,7 @@ int toku_cachetable_get_and_pin_with_dep_pairs (
// the cachetable lock.
//
if (p->checkpoint_pending) {
cachetable_wait_checkpoint++;
write_locked_pair_for_checkpoint(ct, p);
}
......@@ -2454,6 +2456,7 @@ int toku_cachetable_get_and_pin_nonblocking (
// it is clean, then dont run the unlockers, simply
// clear the pending bit and return the PAIR to the user
// but this is simpler.
cachetable_wait_checkpoint++;
write_pair_for_checkpoint(ct, p);
}
else {
......
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