summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Chen <luke.chen@mongodb.com>2022-02-15 08:33:41 +1100
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2022-02-14 22:27:59 +0000
commit359ba798bde76b083059e5e6bc51c589721afc32 (patch)
tree3c43b95fb57363386c4d3e7bfda61fdcc81add98
parent9477a796309f42c468e57e9329f0cba7beaf5514 (diff)
downloadmongo-359ba798bde76b083059e5e6bc51c589721afc32.tar.gz
Import wiredtiger: 303a8d241da752b7c46a5ce84e5537fc360a65a8 from branch mongodb-master
ref: d55dc5ef84..303a8d241d for: 5.3.0 WT-8759 Keep the number of rows and keys/values small for direct I/O runs in test/format
-rw-r--r--src/third_party/wiredtiger/import.data2
-rw-r--r--src/third_party/wiredtiger/test/format/config.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 17a2750e8d4..220bc8a08f2 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": "d55dc5ef84e4c5fc29a6b4502694bd0c20482be3"
+ "commit": "303a8d241da752b7c46a5ce84e5537fc360a65a8"
}
diff --git a/src/third_party/wiredtiger/test/format/config.c b/src/third_party/wiredtiger/test/format/config.c
index cc814fff7bd..bbff4a1ab17 100644
--- a/src/third_party/wiredtiger/test/format/config.c
+++ b/src/third_party/wiredtiger/test/format/config.c
@@ -251,10 +251,11 @@ config_table(TABLE *table, void *arg)
table->max_mem_page = MEGABYTE(TV(BTREE_MEMORY_PAGE_MAX));
/*
- * Keep the number of rows and keys/values small for in-memory runs (overflow items aren't an
- * issue for in-memory configurations and it helps prevents cache overflow).
+ * Keep the number of rows and keys/values small for in-memory and direct I/O runs (overflow
+ * items aren't an issue for in-memory configurations and it helps prevents cache overflow, and
+ * direct I/O can be so slow the additional I/O for overflow items causes eviction to stall).
*/
- if (GV(RUNS_IN_MEMORY)) {
+ if (GV(RUNS_IN_MEMORY) || GV(DISK_DIRECT_IO)) {
if (!config_explicit(table, "runs.rows") && TV(RUNS_ROWS) > 1000000)
config_single(table, "runs.rows=1000000", false);
if (!config_explicit(table, "btree.key_max"))