diff options
author | Chenhao Qu <chenhao.qu@mongodb.com> | 2021-05-24 06:20:45 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-05-24 06:46:40 +0000 |
commit | 781ac650ef59c68fbc257e32c738e4887346159b (patch) | |
tree | c282792ae68ad969ac9ed4808883e20a7f09ec7c | |
parent | 245e51e312e9c8d797a0b16f3b585214ac512620 (diff) | |
download | mongo-781ac650ef59c68fbc257e32c738e4887346159b.tar.gz |
Import wiredtiger: 4f12812afc32494be41c1a1c911c9f986a5bc5e9 from branch mongodb-5.0
ref: c28aff6a18..4f12812afc
for: 5.0.1
WT-7565 Update invalid backup configurations
-rw-r--r-- | src/third_party/wiredtiger/bench/wtperf/runners/500m-btree-50r50u-backup.wtperf | 2 | ||||
-rw-r--r-- | src/third_party/wiredtiger/bench/wtperf/runners/evict-btree-backup.wtperf (renamed from src/third_party/wiredtiger/bench/wtperf/runners/evict-btree-readonly-backup.wtperf) | 5 | ||||
-rw-r--r-- | src/third_party/wiredtiger/bench/wtperf/runners/multi-btree-backup.wtperf | 17 | ||||
-rw-r--r-- | src/third_party/wiredtiger/bench/wtperf/runners/multi-btree-stress-backup.wtperf | 18 | ||||
-rw-r--r-- | src/third_party/wiredtiger/bench/wtperf/runners/multi-btree.wtperf | 1 | ||||
-rw-r--r-- | src/third_party/wiredtiger/import.data | 2 |
6 files changed, 21 insertions, 24 deletions
diff --git a/src/third_party/wiredtiger/bench/wtperf/runners/500m-btree-50r50u-backup.wtperf b/src/third_party/wiredtiger/bench/wtperf/runners/500m-btree-50r50u-backup.wtperf index fdf6a83e94b..cd9213a2c11 100644 --- a/src/third_party/wiredtiger/bench/wtperf/runners/500m-btree-50r50u-backup.wtperf +++ b/src/third_party/wiredtiger/bench/wtperf/runners/500m-btree-50r50u-backup.wtperf @@ -24,4 +24,4 @@ sample_interval=10 sample_rate=1 threads=((count=10,reads=1),(count=10,updates=1)) warmup=120 -backup_interval=300 +backup_interval=1800 diff --git a/src/third_party/wiredtiger/bench/wtperf/runners/evict-btree-readonly-backup.wtperf b/src/third_party/wiredtiger/bench/wtperf/runners/evict-btree-backup.wtperf index ef170c10201..bbd2b059a65 100644 --- a/src/third_party/wiredtiger/bench/wtperf/runners/evict-btree-readonly-backup.wtperf +++ b/src/third_party/wiredtiger/bench/wtperf/runners/evict-btree-backup.wtperf @@ -1,13 +1,12 @@ # wtperf options file: evict btree configuration -conn_config="cache_size=50M,eviction=(threads_max=8),mmap=false" +conn_config="cache_size=50M,eviction=(threads_max=8)" table_config="type=file" icount=10000000 report_interval=5 run_time=120 populate_threads=1 -readonly=true threads=((count=16,reads=1)) # Add throughput/latency monitoring max_latency=2000 sample_interval=5 -backup_interval=40 +backup_interval=30 diff --git a/src/third_party/wiredtiger/bench/wtperf/runners/multi-btree-backup.wtperf b/src/third_party/wiredtiger/bench/wtperf/runners/multi-btree-backup.wtperf new file mode 100644 index 00000000000..c9e962faf55 --- /dev/null +++ b/src/third_party/wiredtiger/bench/wtperf/runners/multi-btree-backup.wtperf @@ -0,0 +1,17 @@ +# wtperf options file: small btree multi-database configuration +# Original cache was 500MB. Shared cache is 500MB * database_count. +conn_config="shared_cache=(name=pool,size=2500MB,chunk=1M),log=(enabled=false)" +database_count=10 +table_config="leaf_page_max=4k,internal_page_max=16k,leaf_item_max=1433,internal_item_max=3100,type=file" +# Likewise, divide original icount by database_count. +icount=50000 +populate_threads=1 +random_range=100000000 +checkpoint_interval=20 +checkpoint_threads=1 +report_interval=5 +run_time=20 +threads=((count=2,reads=1),(count=2,inserts=1)) +value_sz=100 +warmup=10 +backup_interval=5 diff --git a/src/third_party/wiredtiger/bench/wtperf/runners/multi-btree-stress-backup.wtperf b/src/third_party/wiredtiger/bench/wtperf/runners/multi-btree-stress-backup.wtperf deleted file mode 100644 index ec42ec20789..00000000000 --- a/src/third_party/wiredtiger/bench/wtperf/runners/multi-btree-stress-backup.wtperf +++ /dev/null @@ -1,18 +0,0 @@ -# wtperf options file: multi-database configuration attempting to -# trigger slow operations by overloading CPU and disk. -# References Jira WT-2131 -conn_config="cache_size=2GB,eviction=(threads_min=2,threads_max=8),log=(enabled=false),direct_io=(data,checkpoint),buffer_alignment=4096,checkpoint_sync=true,checkpoint=(wait=60)" -table_config="allocation_size=4k,prefix_compression=false,split_pct=75,leaf_page_max=4k,internal_page_max=16k,leaf_item_max=1433,internal_item_max=3100,type=file" -# Divide original icount by database_count. -database_count=5 -icount=50000 -populate_threads=1 -random_range=50000000 -report_interval=5 -run_time=3600 -threads=((count=1,inserts=1),(count=10,reads=1)) -value_sz=100 -max_latency=1000 -sample_interval=5 -sample_rate=1 -backup_interval=240 diff --git a/src/third_party/wiredtiger/bench/wtperf/runners/multi-btree.wtperf b/src/third_party/wiredtiger/bench/wtperf/runners/multi-btree.wtperf index e316dda9e88..9bcb4705bab 100644 --- a/src/third_party/wiredtiger/bench/wtperf/runners/multi-btree.wtperf +++ b/src/third_party/wiredtiger/bench/wtperf/runners/multi-btree.wtperf @@ -1,7 +1,6 @@ # wtperf options file: small btree multi-database configuration # Original cache was 500MB. Shared cache is 500MB * database_count. conn_config="shared_cache=(name=pool,size=2500MB,chunk=1M),log=(enabled=false)" -#conn_config="cache_size=250MB,log=(enabled=false)" database_count=10 table_config="leaf_page_max=4k,internal_page_max=16k,leaf_item_max=1433,internal_item_max=3100,type=file" # Likewise, divide original icount by database_count. diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 13646882d63..c70cc6bc94e 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-5.0", - "commit": "c28aff6a18daedef185f88d908d29d33e3a2adf0" + "commit": "4f12812afc32494be41c1a1c911c9f986a5bc5e9" } |