closes #5439, fix stress test issue

git-svn-id: file:///svn/toku/tokudb@47702 c7de825b-a66e-492c-adef-691d508d4ae1

ft/cachetable.cc

@@ -1528,6 +1528,12 @@ static bool try_pin_pair(
             p->value_rwlock.write_lock(false);
             pair_unlock(p);
         }
+        // small hack here for #5439,
+        // for queries, pf_req_callback does some work for the caller,
+        // that information may be out of date after a write_unlock
+        // followed by a relock, so we do it again.
+        bool pf_required = pf_req_callback(p->value_data,read_extraargs);
+        assert(!pf_required);
         ct->list.read_list_lock();
     }
 
@@ -1744,6 +1750,12 @@ beginning:
             p->value_rwlock.write_unlock();
             p->value_rwlock.read_lock();
             pair_unlock(p);
+            // small hack here for #5439,
+            // for queries, pf_req_callback does some work for the caller,
+            // that information may be out of date after a write_unlock
+            // followed by a read_lock, so we do it again.
+            bool pf_required = pf_req_callback(p->value_data,read_extraargs);
+            assert(!pf_required);
         }
         // We need to be holding the read list lock when we exit.
         // We grab it here because we released it earlier to 

ft/tests/cachetable-clone-partial-fetch.cc

@@ -39,6 +39,7 @@ flush (
 }
 
 static bool true_pf_req_callback(void* UU(ftnode_pv), void* UU(read_extraargs)) {
+    if (pf_called) return false;
     return true;
 }
 

ft/tests/cachetable-partial-fetch.cc

@@ -53,6 +53,7 @@ static bool pf_req_callback(void* UU(ftnode_pv), void* UU(read_extraargs)) {
 }
 
 static bool true_pf_req_callback(void* UU(ftnode_pv), void* UU(read_extraargs)) {
+    if (pf_req_called) return false;
     return true;
 }
 
@@ -156,6 +157,7 @@ cachetable_test (void) {
     //
     // now verify a prefetch that requires a partial fetch works, and that we can then pin the node
     //
+    pf_req_called = false;
     r = toku_cachefile_prefetch(
         f1,
         make_blocknum(1),

ft/tests/cachetable-simple-pin-cheap.cc

@@ -7,6 +7,7 @@
 
 bool pf_called;
 static bool true_pf_req_callback(void* UU(ftnode_pv), void* UU(read_extraargs)) {
+  if (pf_called) return false;
   return true;
 }
 

ft/tests/cachetable-simple-read-pin.cc

@@ -30,6 +30,8 @@ sleep_fetch (CACHEFILE f        __attribute__((__unused__)),
 }
 
 static bool sleep_pf_req_callback(void* UU(ftnode_pv), void* UU(read_extraargs)) {
+    if (pf_called || fetch_called) return false;
+    return true;
   return true;
 }
 
@@ -44,6 +46,8 @@ static void *run_expensive_pf(void *arg) {
     void* v1;
     long s1;
     CACHETABLE_WRITE_CALLBACK wc = def_write_callback(NULL);
+    pf_called = false;
+    fetch_called = false;
     int r = toku_cachetable_get_and_pin(f1, make_blocknum(1), 1, &v1, &s1, wc, sleep_fetch, sleep_pf_req_callback, sleep_pf_callback, false, NULL);
     assert_zero(r);
     assert(pf_called);
@@ -54,6 +58,8 @@ static void *run_expensive_fetch(void *arg) {
     void* v1;
     long s1;
     CACHETABLE_WRITE_CALLBACK wc = def_write_callback(NULL);
+    pf_called = false;
+    fetch_called = false;
     int r = toku_cachetable_get_and_pin(f1, make_blocknum(1), 1, &v1, &s1, wc, sleep_fetch, sleep_pf_req_callback, sleep_pf_callback, false, NULL);
     assert_zero(r);
     assert(fetch_called);