Import wiredtiger: b56f56eb86f0663ad7113ee4a855fea726cacdf2 from branch mongodb-5.0

ref: 6c652d1f2f..b56f56eb86
for: 5.0.0-rc2

WT-7639       Alter test_tiered02.py to collect more data before asserting for missing file

2 files changed, 16 insertions, 1 deletions

diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index ad08b8d04fd..5839d0c466c 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-5.0",
-    "commit": "6c652d1f2f32f841d92b8c29892f7d2c73a90b8a"
+    "commit": "b56f56eb86f0663ad7113ee4a855fea726cacdf2"
 }
diff --git a/src/third_party/wiredtiger/test/suite/test_tiered02.py b/src/third_party/wiredtiger/test/suite/test_tiered02.py
index 61202bd363e..61f0ede77b5 100755
--- a/src/third_party/wiredtiger/test/suite/test_tiered02.py
+++ b/src/third_party/wiredtiger/test/suite/test_tiered02.py
@@ -66,6 +66,21 @@ class test_tiered02(wttest.WiredTigerTestCase):
         got = sorted(list(os.listdir(self.bucket)))
         self.pr('Flushed objects: ' + str(got))
         if increase:
+            # WT-7639: we know that this assertion sometimes fails,
+            # we are collecting more data - we still want it to fail
+            # so it is noticed.
+            if len(got) <= self.flushed_objects:
+                from time import sleep
+                self.prout('directory items: {} is not greater than {}!'.
+                  format(got, self.flushed_objects))
+                self.prout('waiting to see if it resolves')
+                for i in range(0, 10):
+                    self.prout('checking again')
+                    newgot = sorted(list(os.listdir(self.bucket)))
+                    if len(newgot) > self.flushed_objects:
+                        self.prout('resolved, now see: {}'.format(newgot))
+                        break
+                    sleep(i)
             self.assertGreater(len(got), self.flushed_objects)
         else:
             self.assertEqual(len(got), self.flushed_objects)