From 4c48778c94400c2ec57079dcfffa84701f340184 Mon Sep 17 00:00:00 2001 From: Luke Chen Date: Mon, 5 Dec 2022 15:46:43 +1100 Subject: Import wiredtiger: f0ff3ca5c8e3ebe1147059e4200b26dd58e420e4 from branch mongodb-6.0 ref: 39b6544025..f0ff3ca5c8 for: 6.0.4 WT-10081 Fix failure format configs for older branch --- src/third_party/wiredtiger/import.data | 2 +- src/third_party/wiredtiger/test/evergreen.yml | 1 + .../test/format/failure_configs/CONFIG.WT-9805 | 196 --------------------- 3 files changed, 2 insertions(+), 197 deletions(-) delete mode 100644 src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9805 diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index c0d89d28152..da2fd2a01b8 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-6.0", - "commit": "39b6544025d2b4f6bbf5ef251dbcdaffee638fd8" + "commit": "f0ff3ca5c8e3ebe1147059e4200b26dd58e420e4" } diff --git a/src/third_party/wiredtiger/test/evergreen.yml b/src/third_party/wiredtiger/test/evergreen.yml index cd28c788dbf..711e8255f5a 100755 --- a/src/third_party/wiredtiger/test/evergreen.yml +++ b/src/third_party/wiredtiger/test/evergreen.yml @@ -3700,6 +3700,7 @@ buildvariants: -DHAVE_DIAGNOSTIC=1 -DENABLE_PYTHON=1 -DENABLE_ZLIB=1 + -DENABLE_ZSTD=1 -DENABLE_SNAPPY=1 -DENABLE_STRICT=1 -DENABLE_TCMALLOC=1 diff --git a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9805 b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9805 deleted file mode 100644 index 34fd526585b..00000000000 --- a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9805 +++ /dev/null @@ -1,196 +0,0 @@ -############################################ -# RUN PARAMETERS: V3 -############################################ -assert.read_timestamp=0 -backup=0 -backup.incremental=off -backup.incr_granularity=11691 -block_cache=0 -block_cache.cache_on_checkpoint=0 -block_cache.cache_on_writes=1 -block_cache.size=62 -btree.huffman_value=0 -cache=2178 -cache.evict_max=2 -cache.minimum=20 -checkpoint=on -checkpoint.log_size=200 -checkpoint.wait=31 -disk.data_extend=0 -disk.direct_io=0 -disk.encryption=rotn-7 -disk.mmap=1 -disk.mmap_all=0 -format.abort=0 -format.independent_thread_rng=1 -format.major_timeout=0 -import=0 -logging=0 -logging.compression=none -logging.file_max=64891 -logging.prealloc=0 -logging.remove=1 -ops.alter=0 -ops.compaction=0 -ops.hs_cursor=1 -ops.prepare=1 -ops.random_cursor=0 -ops.salvage=0 -ops.verify=1 -quiet=1 -runs.in_memory=0 -runs.ops=0 -runs.rows=1000000 -runs.tables=5 -runs.threads=32 -runs.timer=26 -runs.verify_failure_dump=0 -statistics=0 -statistics.server=0 -stress.aggressive_sweep=0 -stress.checkpoint=0 -stress.checkpoint_evict_page=0 -stress.checkpoint_reserved_txnid_delay=0 -stress.checkpoint_prepare=0 -stress.evict_reposition=0 -stress.failpoint_eviction_fail_after_reconciliation=1 -stress.failpoint_hs_delete_key_from_ts=0 -stress.hs_checkpoint_delay=0 -stress.hs_search=0 -stress.hs_sweep=0 -stress.split_1=0 -stress.split_2=0 -stress.split_3=0 -stress.split_4=0 -stress.split_5=0 -stress.split_6=0 -stress.split_7=0 -transaction.implicit=0 -transaction.timestamps=1 -wiredtiger.config=off -wiredtiger.rwlock=1 -wiredtiger.leak_memory=0 -############################################ -# TABLE PARAMETERS: table 1 -############################################ -table1.btree.compression=snappy -table1.btree.dictionary=0 -table1.btree.internal_key_truncation=1 -table1.btree.internal_page_max=9 -table1.btree.leaf_page_max=10 -table1.btree.memory_page_max=1 -table1.btree.repeat_data_pct=47 -table1.btree.split_pct=77 -table1.btree.value_max=3212 -table1.btree.value_min=0 -table1.disk.checksum=unencrypted -table1.disk.firstfit=0 -table1.ops.pct.delete=55 -table1.ops.pct.insert=42 -table1.ops.pct.modify=3 -table1.ops.pct.read=0 -table1.ops.pct.write=0 -table1.ops.truncate=1 -table1.runs.mirror=0 -table1.runs.source=table -table1.runs.type=variable-length column-store -############################################ -# TABLE PARAMETERS: table 2 -############################################ -table2.btree.compression=zstd -table2.btree.dictionary=0 -table2.btree.internal_key_truncation=1 -table2.btree.internal_page_max=13 -table2.btree.key_max=46 -table2.btree.key_min=25 -table2.btree.leaf_page_max=14 -table2.btree.memory_page_max=6 -table2.btree.prefix_len=0 -table2.btree.prefix_compression=1 -table2.btree.prefix_compression_min=8 -table2.btree.reverse=0 -table2.btree.split_pct=69 -table2.btree.value_max=3706 -table2.btree.value_min=13 -table2.disk.checksum=off -table2.disk.firstfit=0 -table2.ops.pct.delete=72 -table2.ops.pct.insert=0 -table2.ops.pct.modify=5 -table2.ops.pct.read=1 -table2.ops.pct.write=22 -table2.ops.truncate=1 -table2.runs.mirror=0 -table2.runs.source=table -table2.runs.type=row-store -############################################ -# TABLE PARAMETERS: table 3 -############################################ -table3.btree.bitcnt=3 -table3.btree.compression=zlib -table3.btree.internal_key_truncation=1 -table3.btree.internal_page_max=17 -table3.btree.leaf_page_max=11 -table3.btree.memory_page_max=10 -table3.btree.split_pct=81 -table3.disk.checksum=on -table3.disk.firstfit=0 -table3.ops.pct.delete=9 -table3.ops.pct.insert=44 -table3.ops.pct.modify=14 -table3.ops.pct.read=32 -table3.ops.pct.write=1 -table3.ops.truncate=1 -table3.runs.mirror=0 -table3.runs.source=table -table3.runs.type=fixed-length column-store -############################################ -# TABLE PARAMETERS: table 4 -############################################ -table4.btree.compression=zlib -table4.btree.dictionary=1 -table4.btree.internal_key_truncation=1 -table4.btree.internal_page_max=14 -table4.btree.key_max=30 -table4.btree.key_min=27 -table4.btree.leaf_page_max=14 -table4.btree.memory_page_max=9 -table4.btree.prefix_len=67 -table4.btree.prefix_compression=1 -table4.btree.prefix_compression_min=5 -table4.btree.reverse=0 -table4.btree.split_pct=88 -table4.btree.value_max=120 -table4.btree.value_min=20 -table4.disk.checksum=on -table4.disk.firstfit=0 -table4.ops.pct.delete=4 -table4.ops.pct.insert=41 -table4.ops.pct.modify=0 -table4.ops.pct.read=2 -table4.ops.pct.write=53 -table4.ops.truncate=1 -table4.runs.mirror=0 -table4.runs.source=file -table4.runs.type=row-store -############################################ -# TABLE PARAMETERS: table 5 -############################################ -table5.btree.bitcnt=2 -table5.btree.compression=snappy -table5.btree.internal_key_truncation=1 -table5.btree.internal_page_max=11 -table5.btree.leaf_page_max=14 -table5.btree.memory_page_max=7 -table5.btree.split_pct=97 -table5.disk.checksum=on -table5.disk.firstfit=0 -table5.ops.pct.delete=19 -table5.ops.pct.insert=2 -table5.ops.pct.modify=71 -table5.ops.pct.read=7 -table5.ops.pct.write=1 -table5.ops.truncate=1 -table5.runs.mirror=0 -table5.runs.source=table -table5.runs.type=fixed-length column-store -- cgit v1.2.1