summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Chen <luke.chen@mongodb.com>2022-02-15 08:33:34 +1100
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2022-02-14 22:27:59 +0000
commit77cb72e47349fe4fa81646a7a85b0f60bdc41c0f (patch)
treec8256bb0e6b556e15c3fa8278b52f4f46d32560c
parent05bb25c46ccea947f42c603c9bc0756ba745db55 (diff)
downloadmongo-77cb72e47349fe4fa81646a7a85b0f60bdc41c0f.tar.gz
Import wiredtiger: 4375642a0f5e1a1af55ad4a937c50b3bf2f0dd29 from branch mongodb-master
ref: bb94262bda..4375642a0f for: 5.3.0 WT-8743 Configure hs_cleanup configuration to stress the cache less
-rw-r--r--src/third_party/wiredtiger/import.data2
-rw-r--r--src/third_party/wiredtiger/test/cppsuite/configs/hs_cleanup_default.txt7
-rw-r--r--src/third_party/wiredtiger/test/cppsuite/configs/hs_cleanup_stress.txt4
3 files changed, 8 insertions, 5 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 90d65502668..4b5b2f6ea4e 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": "bb94262bdac5537fb63bf019e922893def810706"
+ "commit": "4375642a0f5e1a1af55ad4a937c50b3bf2f0dd29"
}
diff --git a/src/third_party/wiredtiger/test/cppsuite/configs/hs_cleanup_default.txt b/src/third_party/wiredtiger/test/cppsuite/configs/hs_cleanup_default.txt
index e20aa498ca0..7e93b3c8b29 100644
--- a/src/third_party/wiredtiger/test/cppsuite/configs/hs_cleanup_default.txt
+++ b/src/third_party/wiredtiger/test/cppsuite/configs/hs_cleanup_default.txt
@@ -29,9 +29,8 @@ runtime_monitor=
),
stat_cache_size=
(
- # FIXME-WT-8743: Re-enable cache usage check once cache exceed problem is fixed.
max=100,
- runtime=false,
+ runtime=true,
),
stat_db_size=
(
@@ -61,7 +60,9 @@ workload_generator=
update_config=
(
op_rate=10ms,
- ops_per_transaction=(max=100,min=20),
+ # Be careful to not aim too high with this config, if we fill the dirty cache and
+ # all threads are trying to update, they'll get pulled into eviction and will get stuck.
+ ops_per_transaction=(max=20,min=0),
thread_count=10,
value_size=10000
)
diff --git a/src/third_party/wiredtiger/test/cppsuite/configs/hs_cleanup_stress.txt b/src/third_party/wiredtiger/test/cppsuite/configs/hs_cleanup_stress.txt
index 88d0546bd89..1990d066fb4 100644
--- a/src/third_party/wiredtiger/test/cppsuite/configs/hs_cleanup_stress.txt
+++ b/src/third_party/wiredtiger/test/cppsuite/configs/hs_cleanup_stress.txt
@@ -1,6 +1,8 @@
# Run for half an hour.
duration_seconds=1800,
-cache_size_mb=200,
+# The configuration can produce a large number of updates at once, therefore use 500MB cache size
+# to hold these values.
+cache_size_mb=500,
compression_enabled=true,
statistics_config=
(