Import wiredtiger: c1dde2389d34cf4bc0ccfbc5e6e1136f3dbc8ae9 from bran…

…ch mongodb-master ref: 15e567db3a..c1dde2389d for: 7.2.0-rc0 WT-11772 Only rollback txn when the target has been reached in the cppsuite
lakamson · Oct 9, 2023 · 6f9b82e · 6f9b82e
1 parent 915b78f
commit 6f9b82e
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 4 deletions.
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
@@ -2,5 +2,5 @@
     "vendor": "wiredtiger",
     "github": "wiredtiger/wiredtiger.git",
     "branch": "mongodb-master",
-    "commit": "15e567db3a1adbc9b520a479a9d99bd448a1bd9c"
+    "commit": "c1dde2389d34cf4bc0ccfbc5e6e1136f3dbc8ae9"
 }
diff --git a/src/third_party/wiredtiger/test/cppsuite/src/main/database_operation.cpp b/src/third_party/wiredtiger/test/cppsuite/src/main/database_operation.cpp
@@ -267,7 +267,8 @@ database_operation::read_operation(thread_worker *tc)
                     testutil_die(ret, "Unexpected error returned from cursor->next()");
             }
             tc->txn.add_op();
-            tc->txn.try_rollback();
+            if (tc->txn.get_op_count() >= tc->txn.get_target_op_count())
+                tc->txn.rollback();
             tc->sleep();
         }
         /* Reset our cursor to avoid pinning content. */

diff --git a/src/third_party/wiredtiger/test/cppsuite/src/main/transaction.cpp b/src/third_party/wiredtiger/test/cppsuite/src/main/transaction.cpp
@@ -126,6 +126,12 @@ transaction::try_rollback(const std::string &config)
         rollback(config);
 }
 
+int64_t
+transaction::get_op_count() const
+{
+    return _op_count;
+}
+
 int64_t
 transaction::get_target_op_count() const
 {

diff --git a/src/third_party/wiredtiger/test/cppsuite/src/main/transaction.h b/src/third_party/wiredtiger/test/cppsuite/src/main/transaction.h
@@ -66,6 +66,8 @@ class transaction {
      * the transaction.
      */
     bool can_commit();
+    /* Get the current number of operations executed. */
+    int64_t get_op_count() const;
     /* Get the number of operations this transaction needs before it can commit */
     int64_t get_target_op_count() const;
 

diff --git a/src/third_party/wiredtiger/test/cppsuite/tests/bounded_cursor_prefix_search_near.cpp b/src/third_party/wiredtiger/test/cppsuite/tests/bounded_cursor_prefix_search_near.cpp
@@ -211,7 +211,8 @@ class bounded_cursor_prefix_search_near : public test {
                   ret, exact_prefix, key_prefix_str, cursor_default, generated_prefix);
 
                 tc->txn.add_op();
-                tc->txn.try_rollback();
+                if (tc->txn.get_op_count() >= tc->txn.get_target_op_count())
+                    tc->txn.rollback();
                 tc->sleep();
             }
             testutil_check(cursor_prefix->reset(cursor_prefix.get()));

diff --git a/src/third_party/wiredtiger/test/cppsuite/tests/bounded_cursor_stress.cpp b/src/third_party/wiredtiger/test/cppsuite/tests/bounded_cursor_stress.cpp
@@ -763,7 +763,8 @@ class bounded_cursor_stress : public test {
                     testutil_assert(ret == 0 || ret == WT_ROLLBACK);
                 }
                 tc->txn.add_op();
-                tc->txn.try_rollback();
+                if (tc->txn.get_op_count() >= tc->txn.get_target_op_count())
+                    tc->txn.rollback();
                 tc->sleep();
             }
             normal_cursor->reset(normal_cursor.get());