summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEtienne Petrel <etienne.petrel@mongodb.com>2022-03-14 04:17:30 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2022-03-14 04:53:58 +0000
commit1b4713185dc509784b9bc7f984a4dce7b39e6b60 (patch)
tree74006eaef693ad96085e48e8004ef16fd56c427f
parent1b5cf2fa6fc204e1cf6a6e95a91fbbaad85eedf6 (diff)
downloadmongo-1b4713185dc509784b9bc7f984a4dce7b39e6b60.tar.gz
Import wiredtiger: e3d8b3a08567511fd48b2ca16f9a31be023b71c4 from branch mongodb-master
ref: dd6a6bd0d5..e3d8b3a085 for: 6.0.0 WT-8823 Wait for checkpoint to start using statistics instead of fixed sleep in test_rollback_to_stable26
-rw-r--r--src/third_party/wiredtiger/import.data2
-rwxr-xr-xsrc/third_party/wiredtiger/test/suite/test_rollback_to_stable26.py11
2 files changed, 10 insertions, 3 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 60652489c34..d9d704a0118 100644
--- 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": "dd6a6bd0d5dfacfbf2a5a8698ccde02f93ea9eb4"
+ "commit": "e3d8b3a08567511fd48b2ca16f9a31be023b71c4"
}
diff --git a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable26.py b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable26.py
index 8d905560e03..8b457613386 100755
--- a/src/third_party/wiredtiger/test/suite/test_rollback_to_stable26.py
+++ b/src/third_party/wiredtiger/test/suite/test_rollback_to_stable26.py
@@ -128,8 +128,15 @@ class test_rollback_to_stable26(test_rollback_to_stable_base):
ckpt = checkpoint_thread(self.conn, done)
try:
ckpt.start()
- # Sleep for sometime so that checkpoint starts before committing last transaction.
- time.sleep(5)
+
+ # Wait for checkpoint to start before committing last transaction.
+ ckpt_started = 0
+ while not ckpt_started:
+ stat_cursor = self.session.open_cursor('statistics:', None, None)
+ ckpt_started = stat_cursor[stat.conn.txn_checkpoint_running][2]
+ stat_cursor.close()
+ time.sleep(1)
+
prepare_session.rollback_transaction()
finally:
done.set()