diff options
| author | Will Korteland <will.korteland@mongodb.com> | 2022-03-17 09:58:00 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-03-17 10:24:10 +0000 |
| commit | b25e3264c65277f70a9e8af97320dba695cf4c4e (patch) | |
| tree | b0ae8fac0383d92d56a726e67486f034dfd67eae | |
| parent | 1a66313ba21dfca3e6aca4e3e9689500e4947569 (diff) | |
| download | mongo-b25e3264c65277f70a9e8af97320dba695cf4c4e.tar.gz | |
Import wiredtiger: 2d852e2e1765e47486d1a85bd4422020d3feddc8 from branch mongodb-master
ref: d137505a2e..2d852e2e17
for: 6.0.0
WT-8941 Ignore local_retention race in test_tiered10
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rwxr-xr-x | src/third_party/wiredtiger/test/suite/test_tiered09.py | 8 | ||||
| -rwxr-xr-x | src/third_party/wiredtiger/test/suite/test_tiered10.py | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index de71104112a..14d48c959c7 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": "2181972548c107d847a632459fd6f74deaa5c3d9" + "commit": "2d852e2e1765e47486d1a85bd4422020d3feddc8" } diff --git a/src/third_party/wiredtiger/test/suite/test_tiered09.py b/src/third_party/wiredtiger/test/suite/test_tiered09.py index 288a9f2f14d..39e6bc69e8e 100755 --- a/src/third_party/wiredtiger/test/suite/test_tiered09.py +++ b/src/third_party/wiredtiger/test/suite/test_tiered09.py @@ -129,7 +129,8 @@ class test_tiered09(wttest.WiredTigerTestCase): # to drop the local objects. Clean them up now to make sure we can open # the correct object in the bucket. localobj = './' + self.obj1file - os.remove(localobj) + if os.path.exists(localobj): + os.remove(localobj) # Reopen the connection with a different prefix this time. conn_params = self.saved_conn + ',tiered_storage=(bucket_prefix=%s)' % self.prefix2 @@ -163,8 +164,11 @@ class test_tiered09(wttest.WiredTigerTestCase): # to drop the local objects. Clean them up now to make sure we can open # the correct object in the bucket. localobj = './' + self.obj2file - os.remove(localobj) + if os.path.exists(localobj): + os.remove(localobj) localobj = './' + self.obj1second + if os.path.exists(localobj): + os.remove(localobj) # Reopen with the other prefix and check all data. Even though we're using the # other prefix, we should find all the data in the object with the original diff --git a/src/third_party/wiredtiger/test/suite/test_tiered10.py b/src/third_party/wiredtiger/test/suite/test_tiered10.py index 2f928910b39..70d1c0c377f 100755 --- a/src/third_party/wiredtiger/test/suite/test_tiered10.py +++ b/src/third_party/wiredtiger/test/suite/test_tiered10.py @@ -150,9 +150,11 @@ class test_tiered10(wttest.WiredTigerTestCase): # Remove the local copies of the objects before we reopen so that we force # the system to read from the bucket or bucket cache. local = self.conn1_dir + '/' + self.obj1file - os.remove(local) + if os.path.exists(local): + os.remove(local) local = self.conn2_dir + '/' + self.obj1file - os.remove(local) + if os.path.exists(local): + os.remove(local) conn1 = self.wiredtiger_open(self.conn1_dir, conn1_params) session1 = conn1.open_session() |