refs #5672 #5351 increase drd timeouts some more (ugh), make locktree stop...

refs #5672 #5351 increase drd timeouts some more (ugh), make locktree stop reporting false positives


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

locktree/locktree.cc

@@ -409,11 +409,11 @@ void locktree::remove_overlapping_locks_for_txnid(TXNID txnid,
     release_range.destroy();
 }
 
-inline bool locktree::sto_txnid_is_valid_unsafe(void) const {
+bool locktree::sto_txnid_is_valid_unsafe(void) const {
     return m_sto_txnid != TXNID_NONE;
 }
 
-inline int locktree::sto_get_score_unsafe(void) const {
+int locktree::sto_get_score_unsafe(void) const {
     return m_sto_score;
 }
 

src/tests/CMakeLists.txt

@@ -476,8 +476,8 @@ if(BUILD_TESTING OR BUILD_SRC_TESTS)
       add_drd_test(ydb/drd_mid_${test} ${CMAKE_CFG_INTDIR}/run_stress_test.sh $<TARGET_FILE:mid_${test}> 10000 100 18000)
       set_tests_properties(ydb/drd_mid_${test} PROPERTIES TIMEOUT 21600)
       add_custom_executable(large ${test} ${base})
-      add_drd_test(ydb/drd_large_${test} ${CMAKE_CFG_INTDIR}/run_stress_test.sh $<TARGET_FILE:large_${test}> 150000 1000 18000)
-      set_tests_properties(ydb/drd_large_${test} PROPERTIES TIMEOUT 21600)
+      add_drd_test(ydb/drd_large_${test} ${CMAKE_CFG_INTDIR}/run_stress_test.sh $<TARGET_FILE:large_${test}> 150000 1000 24000)
+      set_tests_properties(ydb/drd_large_${test} PROPERTIES TIMEOUT 25600)
     endif()
   endforeach(src)