summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEtienne Petrel <etienne.petrel@mongodb.com>2022-03-15 05:15:29 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2022-03-15 05:45:32 +0000
commit619b7a4f876d1fec82e12ec544ae8ada22dcea17 (patch)
tree7e719862ff7bfe78fff7bf87aab879887058ca58
parentb5148d29b4c4dd48c21233bcf387b2fa52ee1902 (diff)
downloadmongo-619b7a4f876d1fec82e12ec544ae8ada22dcea17.tar.gz
Import wiredtiger: a5d55eec2229a8da1233103d117871a7f51e1df8 from branch mongodb-master
ref: e28c2c63bd..a5d55eec22 for: 6.0.0 WT-8923 Set the WT_READ_VISIBLE_ALL flag for the tree walk routines
-rw-r--r--src/third_party/wiredtiger/import.data2
-rw-r--r--src/third_party/wiredtiger/src/evict/evict_lru.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index c32f2fe2c4e..95ba62293be 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": "e28c2c63bd2448d26047d3531ea59905b57668b6"
+ "commit": "a5d55eec2229a8da1233103d117871a7f51e1df8"
}
diff --git a/src/third_party/wiredtiger/src/evict/evict_lru.c b/src/third_party/wiredtiger/src/evict/evict_lru.c
index 0cdcd31ad14..6788809dcf9 100644
--- a/src/third_party/wiredtiger/src/evict/evict_lru.c
+++ b/src/third_party/wiredtiger/src/evict/evict_lru.c
@@ -2579,11 +2579,11 @@ __verbose_dump_cache_single(WT_SESSION_IMPL *session, uint64_t *total_bytesp,
* skipped it.
*/
if (F_ISSET(dhandle, WT_DHANDLE_EXCLUSIVE))
- return (__wt_msg(session, " Opened exclusively. Cannot walk tree, skipping."));
+ return (__wt_msg(session, " handle opened exclusively, cannot walk tree, skipping"));
next_walk = NULL;
- while (__wt_tree_walk(
- session, &next_walk, WT_READ_CACHE | WT_READ_NO_EVICT | WT_READ_NO_WAIT) == 0 &&
+ while (__wt_tree_walk(session, &next_walk,
+ WT_READ_CACHE | WT_READ_NO_EVICT | WT_READ_NO_WAIT | WT_READ_VISIBLE_ALL) == 0 &&
next_walk != NULL) {
page = next_walk->page;
size = page->memory_footprint;