summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Chen <luke.chen@mongodb.com>2022-11-21 14:13:54 +1100
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2022-11-21 03:46:22 +0000
commit4cc5fbff67cee1d004e9ac70c772228010e8637b (patch)
tree8e323a77c22ab2992c1351ffcd7f260da6b22d43
parent47f04b076c92acf54450336e712006c85d7b6b2d (diff)
downloadmongo-4cc5fbff67cee1d004e9ac70c772228010e8637b.tar.gz
Import wiredtiger: 47951efac16fbf8e5d44230ad18fce1b18858cda from branch mongodb-master
ref: 9a23ed36e1..47951efac1 for: 6.3.0-rc0 WT-7492 Ignore the evict drain wait msg in stdout.txt for test_cursor_random
-rw-r--r--src/third_party/wiredtiger/import.data2
-rwxr-xr-xsrc/third_party/wiredtiger/test/suite/test_cursor_random.py20
2 files changed, 21 insertions, 1 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 44fd23020d1..c7c0ee94b22 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": "9a23ed36e160f47df4068de05795d9c1f4f12e78"
+ "commit": "47951efac16fbf8e5d44230ad18fce1b18858cda"
}
diff --git a/src/third_party/wiredtiger/test/suite/test_cursor_random.py b/src/third_party/wiredtiger/test/suite/test_cursor_random.py
index ac9fd07a8ee..97d8388c9b0 100755
--- a/src/third_party/wiredtiger/test/suite/test_cursor_random.py
+++ b/src/third_party/wiredtiger/test/suite/test_cursor_random.py
@@ -110,6 +110,11 @@ class test_cursor_random(wttest.WiredTigerTestCase):
list.append(cursor.get_key())
self.assertGreater(len(set(list)), 80)
+ # Ignore the eviction generation drain warning as it is possible for eviction to
+ # take longer to evict pages due to overflow items on the page.
+ self.conn.close()
+ self.ignoreStdoutPatternIfExists('evict generation drain waited')
+
def test_cursor_random_multiple_insert_records_small(self):
self.cursor_random_multiple_insert_records(2000)
def test_cursor_random_multiple_insert_records_large(self):
@@ -137,6 +142,11 @@ class test_cursor_random(wttest.WiredTigerTestCase):
list.append(cursor.get_key())
self.assertGreater(len(set(list)), 80)
+ # Ignore the eviction generation drain warning as it is possible for eviction to
+ # take longer to evict pages due to overflow items on the page.
+ self.conn.close()
+ self.ignoreStdoutPatternIfExists('evict generation drain waited')
+
def test_cursor_random_multiple_page_records_reopen_small(self):
self.cursor_random_multiple_page_records(2000, True)
def test_cursor_random_multiple_page_records_reopen_large(self):
@@ -169,6 +179,11 @@ class test_cursor_random(wttest.WiredTigerTestCase):
for i in range(1,10):
self.assertEqual(cursor.next(), 0)
+ # Ignore the eviction generation drain warning as it is possible for eviction to
+ # take longer to evict pages due to overflow items on the page.
+ self.conn.close()
+ self.ignoreStdoutPatternIfExists('evict generation drain waited')
+
# Check that next_random fails in the presence of a set of values, all of
# which are deleted.
def test_cursor_random_deleted_all(self):
@@ -186,6 +201,11 @@ class test_cursor_random(wttest.WiredTigerTestCase):
for i in range(1,10):
self.assertTrue(cursor.next(), wiredtiger.WT_NOTFOUND)
+ # Ignore the eviction generation drain warning as it is possible for eviction to
+ # take longer to evict pages due to overflow items on the page.
+ self.conn.close()
+ self.ignoreStdoutPatternIfExists('evict generation drain waited')
+
# Check that opening a random cursor on column-store returns not-supported.
class test_cursor_random_column(wttest.WiredTigerTestCase):
type_values = [