summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/third_party/wiredtiger/import.data2
-rw-r--r--src/third_party/wiredtiger/src/btree/bt_random.c7
2 files changed, 5 insertions, 4 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index f25a44554c1..cffaacccdaf 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-4.2",
- "commit": "9d20694ad13222211f2afb3b2328163b5156fb6c"
+ "commit": "91e1466e1dbc024d00c89b34630551348767399e"
}
diff --git a/src/third_party/wiredtiger/src/btree/bt_random.c b/src/third_party/wiredtiger/src/btree/bt_random.c
index fa59f785757..b0647156c30 100644
--- a/src/third_party/wiredtiger/src/btree/bt_random.c
+++ b/src/third_party/wiredtiger/src/btree/bt_random.c
@@ -298,10 +298,11 @@ __random_leaf(WT_CURSOR_BTREE *cbt)
return (__cursor_kv_return(cbt, upd));
/*
- * Try again if there are at least a few hundred disk-based entries: this may be a normal leaf
- * page with big items.
+ * Try again if there are at least a few hundred disk-based entries or this is a page as we read
+ * it from disk, it might be a normal leaf page with big items.
*/
- if (cbt->ref->page->entries > WT_RANDOM_DISK_ENOUGH / 2) {
+ if (cbt->ref->page->entries > WT_RANDOM_DISK_ENOUGH / 5 ||
+ (cbt->ref->page->dsk != NULL && cbt->ref->page->modify == NULL)) {
WT_RET(__random_leaf_disk(cbt, &upd, &valid));
if (valid)
return (__cursor_kv_return(cbt, upd));