diff options
author | Etienne Petrel <etienne.petrel@mongodb.com> | 2022-06-20 23:12:52 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-06-20 23:41:59 +0000 |
commit | cf7a66cd4f524cb973df4784d3ebbcebbe06b750 (patch) | |
tree | 1849050638720cc9e25c5aacdc1c51d7ca5b72ba /src/third_party | |
parent | d7452f9fd752492ca15d473b801283846b6967ab (diff) | |
download | mongo-cf7a66cd4f524cb973df4784d3ebbcebbe06b750.tar.gz |
Import wiredtiger: 2666d037c9ebfc84db2c739dfc10dab0e28b3e02 from branch mongodb-master
ref: 069fb7b704..2666d037c9
for: 6.1.0-rc0
WT-9430 Fix test_timestamp20 occasional failure by doing a checkpoint before evicting the pages
Diffstat (limited to 'src/third_party')
-rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
-rw-r--r-- | src/third_party/wiredtiger/test/suite/test_timestamp20.py | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 86a5371583a..d9d35bf20c1 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": "069fb7b70440d2b4d8c815105ec0cd3b08cde6cf" + "commit": "2666d037c9ebfc84db2c739dfc10dab0e28b3e02" } diff --git a/src/third_party/wiredtiger/test/suite/test_timestamp20.py b/src/third_party/wiredtiger/test/suite/test_timestamp20.py index 896b1052c0c..e1bfc6d0e0d 100644 --- a/src/third_party/wiredtiger/test/suite/test_timestamp20.py +++ b/src/third_party/wiredtiger/test/suite/test_timestamp20.py @@ -107,7 +107,10 @@ class test_timestamp20(wttest.WiredTigerTestCase): cursor[self.get_key(i)] = value5 self.session.commit_transaction('commit_timestamp=' + self.timestamp_str(40)) + # Run a checkpoint to clean the tree to ensure the pages are evictable + self.session.checkpoint() self.evict(uri) + self.session.begin_transaction('read_timestamp=' + self.timestamp_str(30)) for i in range(1, 10000): self.assertEqual(cursor[self.get_key(i)], value4) @@ -182,7 +185,10 @@ class test_timestamp20(wttest.WiredTigerTestCase): cursor[self.get_key(i)] = value3 self.session.commit_transaction('commit_timestamp=' + self.timestamp_str(50)) + # Run a checkpoint to clean the tree to ensure the pages are evictable + self.session.checkpoint() self.evict(uri) + # Open up a new transaction and read at 30. # We shouldn't be able to see past no timestamp due to txnid visibility. self.session.begin_transaction('read_timestamp=' + self.timestamp_str(30)) |