diff options
author | Alex Gorrod <alexg@wiredtiger.com> | 2014-09-19 12:20:42 +1000 |
---|---|---|
committer | Alex Gorrod <alexg@wiredtiger.com> | 2014-09-19 12:20:42 +1000 |
commit | 1b95b9030b3243ab675e20291b4e7aa0c7a92e85 (patch) | |
tree | 29db59b709ee11f257fa77600e9c1c7f1d853f4d /bench | |
parent | 8a5cd12bcb643c38cd391f590393598e4e972614 (diff) | |
download | mongo-1b95b9030b3243ab675e20291b4e7aa0c7a92e85.tar.gz |
Remove lsm=(merge_threads) configuration option.
It's been replaced by lsm_manager=(worker_thread_max). Update
all places it was used in our tree, and add note to upgrade doc.
Diffstat (limited to 'bench')
32 files changed, 48 insertions, 48 deletions
diff --git a/bench/wtperf/runners/evict-lsm.wtperf b/bench/wtperf/runners/evict-lsm.wtperf index 2238363f941..7fcaaba42aa 100644 --- a/bench/wtperf/runners/evict-lsm.wtperf +++ b/bench/wtperf/runners/evict-lsm.wtperf @@ -1,6 +1,6 @@ # wtperf options file: evict lsm configuration conn_config="cache_size=50M" -table_config="lsm=(merge_threads=2),type=lsm,os_cache_dirty_max=16MB" +table_config="type=lsm,os_cache_dirty_max=16MB" compact=true icount=10000000 report_interval=5 diff --git a/bench/wtperf/runners/fruit-lsm.wtperf b/bench/wtperf/runners/fruit-lsm.wtperf index 0a97beb037b..a34c74d5e08 100644 --- a/bench/wtperf/runners/fruit-lsm.wtperf +++ b/bench/wtperf/runners/fruit-lsm.wtperf @@ -2,12 +2,12 @@ # The configuration for the connection and table are from riak and the # specification of the data (count, size, threads) is from basho_bench. # -conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024,statistics=(fast,clear),statistics_log=(wait=600),log=(enabled=true),transaction_sync=(enabled=true,method=none),checkpoint=(wait=180)" +conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024,statistics=(fast,clear),statistics_log=(wait=600),log=(enabled=true),transaction_sync=(enabled=true,method=none),checkpoint=(wait=180),lsm_manager=(worker_thread_max=12)" #conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024,statistics=(fast,clear),statistics_log=(wait=600)" #conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024" compact=true sess_config="isolation=snapshot" -table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_size=100MB,merge_threads=2),type=lsm,leaf_page_max=16K,leaf_item_max=4K,os_cache_dirty_max=16MB" +table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_size=100MB),type=lsm,leaf_page_max=16K,leaf_item_max=4K,os_cache_dirty_max=16MB" icount=25000000 key_sz=40 value_sz=800 diff --git a/bench/wtperf/runners/fruit-short.wtperf b/bench/wtperf/runners/fruit-short.wtperf index 7883a64116b..e28b100b23a 100644 --- a/bench/wtperf/runners/fruit-short.wtperf +++ b/bench/wtperf/runners/fruit-short.wtperf @@ -6,7 +6,7 @@ conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024" compact=true sess_config="isolation=snapshot" -table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_size=100MB,merge_threads=2),type=lsm,leaf_page_max=16K" +table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_size=100MB),type=lsm,leaf_page_max=16K" icount=25000000 key_sz=40 value_sz=800 diff --git a/bench/wtperf/runners/large-lsm.wtperf b/bench/wtperf/runners/large-lsm.wtperf index ac3c3c9e0d3..ede53b5b26c 100644 --- a/bench/wtperf/runners/large-lsm.wtperf +++ b/bench/wtperf/runners/large-lsm.wtperf @@ -1,6 +1,6 @@ # wtperf options file: large lsm configuration conn_config="cache_size=20G,mmap=false" -table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_max=5GB,chunk_size=100MB,merge_threads=3),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" +table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_max=5GB,chunk_size=100MB),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" compact=true compression="snappy" icount=250000000 diff --git a/bench/wtperf/runners/medium-lsm-async.wtperf b/bench/wtperf/runners/medium-lsm-async.wtperf index f425f130eb3..07ffd3d84d4 100644 --- a/bench/wtperf/runners/medium-lsm-async.wtperf +++ b/bench/wtperf/runners/medium-lsm-async.wtperf @@ -1,7 +1,7 @@ # wtperf options file: medium lsm configuration using async operations conn_config="cache_size=1G" async_threads=10 -table_config="lsm=(chunk_size=100MB,merge_threads=2),type=lsm,os_cache_dirty_max=16MB" +table_config="lsm=(chunk_size=100MB),type=lsm,os_cache_dirty_max=16MB" icount=50000000 report_interval=5 run_time=120 diff --git a/bench/wtperf/runners/medium-lsm-compact.wtperf b/bench/wtperf/runners/medium-lsm-compact.wtperf index e420cb1aef7..9b31e256ea7 100644 --- a/bench/wtperf/runners/medium-lsm-compact.wtperf +++ b/bench/wtperf/runners/medium-lsm-compact.wtperf @@ -1,6 +1,6 @@ # wtperf options file: medium lsm configuration conn_config="cache_size=1G" -table_config="lsm=(chunk_size=100MB,merge_threads=2,chunk_max=1TB),type=lsm,os_cache_dirty_max=16MB" +table_config="lsm=(chunk_size=100MB,chunk_max=1TB),type=lsm,os_cache_dirty_max=16MB" icount=50000000 populate_threads=1 compact=true diff --git a/bench/wtperf/runners/medium-lsm.wtperf b/bench/wtperf/runners/medium-lsm.wtperf index 989d7af2d3a..08ee2d9197c 100644 --- a/bench/wtperf/runners/medium-lsm.wtperf +++ b/bench/wtperf/runners/medium-lsm.wtperf @@ -1,6 +1,6 @@ # wtperf options file: medium lsm configuration conn_config="cache_size=1G" -table_config="lsm=(chunk_size=100MB,merge_threads=2),type=lsm,os_cache_dirty_max=16MB" +table_config="lsm=(chunk_size=100MB),type=lsm,os_cache_dirty_max=16MB" icount=50000000 report_interval=5 run_time=120 diff --git a/bench/wtperf/runners/medium-multi-lsm-noprefix.wtperf b/bench/wtperf/runners/medium-multi-lsm-noprefix.wtperf index f5020a46b91..413c16075d3 100644 --- a/bench/wtperf/runners/medium-multi-lsm-noprefix.wtperf +++ b/bench/wtperf/runners/medium-multi-lsm-noprefix.wtperf @@ -1,6 +1,6 @@ # wtperf options file: medium lsm configuration, with multiple tables. -conn_config="cache_size=1G" -table_config="lsm=(chunk_size=100MB,merge_threads=2,chunk_max=1TB),type=lsm,prefix_compression=false,os_cache_dirty_max=16MB" +conn_config="cache_size=1G,lsm_manager=(worker_thread_max=8)" +table_config="lsm=(chunk_size=100MB,chunk_max=1TB),type=lsm,prefix_compression=false,os_cache_dirty_max=16MB" icount=50000000 populate_threads=1 compact=true diff --git a/bench/wtperf/runners/medium-multi-lsm.wtperf b/bench/wtperf/runners/medium-multi-lsm.wtperf index 787b819c854..99b7b49aebd 100644 --- a/bench/wtperf/runners/medium-multi-lsm.wtperf +++ b/bench/wtperf/runners/medium-multi-lsm.wtperf @@ -1,6 +1,6 @@ # wtperf options file: medium lsm configuration, with multiple tables. -conn_config="cache_size=1G" -table_config="lsm=(chunk_size=100MB,merge_threads=2,chunk_max=1TB),type=lsm,os_cache_dirty_max=16MB" +conn_config="cache_size=1G,lsm_manager=(worker_thread_max=8)" +table_config="lsm=(chunk_size=100MB,chunk_max=1TB),type=lsm,os_cache_dirty_max=16MB" icount=50000000 populate_threads=1 compact=true diff --git a/bench/wtperf/runners/parallel-pop-lsm.wtperf b/bench/wtperf/runners/parallel-pop-lsm.wtperf index 6b318d41ca5..41309fd07de 100644 --- a/bench/wtperf/runners/parallel-pop-lsm.wtperf +++ b/bench/wtperf/runners/parallel-pop-lsm.wtperf @@ -1,7 +1,7 @@ # wtperf options file: Run populate thread multi-threaded and with groups # of operations in each transaction. conn_config="cache_size=200MB" -table_config="lsm=(merge_threads=2),type=lsm,os_cache_dirty_max=16MB" +table_config="type=lsm,os_cache_dirty_max=16MB" transaction_config="isolation=snapshot" icount=10000000 report_interval=5 diff --git a/bench/wtperf/runners/test1-1b-lsm.wtperf b/bench/wtperf/runners/test1-1b-lsm.wtperf index 711d9e698bd..662a286970c 100644 --- a/bench/wtperf/runners/test1-1b-lsm.wtperf +++ b/bench/wtperf/runners/test1-1b-lsm.wtperf @@ -3,11 +3,11 @@ # specification of the data (count, size, threads) is from basho_bench. # #conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024,statistics=(fast,clear),statistics_log=(wait=60)" -conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024" +conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024,lsm_manager=(worker_thread_max=6)" compact=true compression="snappy" sess_config="isolation=snapshot" -table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_max=5GB,chunk_size=100MB,merge_threads=3),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" +table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_max=5GB,chunk_size=100MB),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" icount=1000000000 key_sz=40 value_sz=1000 diff --git a/bench/wtperf/runners/test1-2b-lsm.wtperf b/bench/wtperf/runners/test1-2b-lsm.wtperf index 6443159f68d..2a3923e62ab 100644 --- a/bench/wtperf/runners/test1-2b-lsm.wtperf +++ b/bench/wtperf/runners/test1-2b-lsm.wtperf @@ -3,11 +3,11 @@ # specification of the data (count, size, threads) is from basho_bench. # #conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024,statistics=(fast,clear),statistics_log=(wait=60)" -conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024" +conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024,lsm_manager=(worker_thread_max=6)" compact=true compression="snappy" sess_config="isolation=snapshot" -table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_max=20GB,chunk_size=100MB,merge_threads=4),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" +table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_max=20GB,chunk_size=100MB),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" icount=2000000000 key_sz=40 value_sz=1000 diff --git a/bench/wtperf/runners/test1-500m-lsm.wtperf b/bench/wtperf/runners/test1-500m-lsm.wtperf index 52237cec8e9..91c7858a605 100644 --- a/bench/wtperf/runners/test1-500m-lsm.wtperf +++ b/bench/wtperf/runners/test1-500m-lsm.wtperf @@ -3,11 +3,11 @@ # specification of the data (count, size, threads) is from basho_bench. # #conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024,statistics=(fast,clear),statistics_log=(wait=60)" -conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024" +conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024,lsm_manager=(worker_thread_max=6)" compact=true compression="snappy" sess_config="isolation=snapshot" -table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_max=5GB,chunk_size=100MB,merge_threads=3),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" +table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_max=5GB,chunk_size=100MB),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" icount=500000000 key_sz=40 value_sz=1000 diff --git a/bench/wtperf/runners/test1-50m-lsm.wtperf b/bench/wtperf/runners/test1-50m-lsm.wtperf index ae8578a9173..3bb72adf9ef 100644 --- a/bench/wtperf/runners/test1-50m-lsm.wtperf +++ b/bench/wtperf/runners/test1-50m-lsm.wtperf @@ -6,7 +6,7 @@ conn_config="cache_size=10G,checkpoint_sync=false,mmap=false,session_max=1024" compact=true sess_config="isolation=snapshot" -table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_size=100MB,merge_threads=2),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" +table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_size=100MB),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" icount=50000000 key_sz=40 value_sz=1000 diff --git a/bench/wtperf/runners/test2-1b-lsm.wtperf b/bench/wtperf/runners/test2-1b-lsm.wtperf index 17ac0bfc67a..63f8f31c1e6 100644 --- a/bench/wtperf/runners/test2-1b-lsm.wtperf +++ b/bench/wtperf/runners/test2-1b-lsm.wtperf @@ -8,7 +8,7 @@ conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024" compression="snappy" create=false sess_config="isolation=snapshot" -table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_max=5GB,chunk_size=100MB,merge_threads=3),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" +table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_max=5GB,chunk_size=100MB),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" key_sz=40 value_sz=1000 max_latency=2000 diff --git a/bench/wtperf/runners/test2-2b-lsm.wtperf b/bench/wtperf/runners/test2-2b-lsm.wtperf index 572d6b1071d..7fc1155bcb2 100644 --- a/bench/wtperf/runners/test2-2b-lsm.wtperf +++ b/bench/wtperf/runners/test2-2b-lsm.wtperf @@ -4,11 +4,11 @@ # This test assumes that a test1 populate already completed and exists. # #conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024,statistics=(fast,clear),statistics_log=(wait=60)" -conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024" +conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024,lsm_manager=(worker_thread_max=6)" compression="snappy" create=false sess_config="isolation=snapshot" -table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_max=20GB,chunk_size=100MB,merge_threads=4),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" +table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_max=20GB,chunk_size=100MB),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" key_sz=40 value_sz=1000 max_latency=2000 diff --git a/bench/wtperf/runners/test2-500m-lsm.wtperf b/bench/wtperf/runners/test2-500m-lsm.wtperf index 43deb9d5ae3..c03f5041a4d 100644 --- a/bench/wtperf/runners/test2-500m-lsm.wtperf +++ b/bench/wtperf/runners/test2-500m-lsm.wtperf @@ -4,11 +4,11 @@ # This test assumes that a test1 populate already completed and exists. # #conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024,statistics=(fast,clear),statistics_log=(wait=60)" -conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024" +conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024,lsm_manager=(worker_thread_max=6)" create=false compression="snappy" sess_config="isolation=snapshot -table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_max=5GB,chunk_size=100MB,merge_threads=3),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" +table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_max=5GB,chunk_size=100MB),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" key_sz=40 value_sz=1000 max_latency=2000 diff --git a/bench/wtperf/runners/test2-50m-lsm.wtperf b/bench/wtperf/runners/test2-50m-lsm.wtperf index bac13dfc3a0..5ad86f270a3 100644 --- a/bench/wtperf/runners/test2-50m-lsm.wtperf +++ b/bench/wtperf/runners/test2-50m-lsm.wtperf @@ -7,7 +7,7 @@ conn_config="cache_size=10G,checkpoint_sync=false,mmap=false,session_max=1024" create=false sess_config="isolation=snapshot" -table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_size=100MB,merge_threads=2),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" +table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_size=100MB),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" key_sz=40 value_sz=1000 max_latency=2000 diff --git a/bench/wtperf/runners/test3-1b-lsm.wtperf b/bench/wtperf/runners/test3-1b-lsm.wtperf index a2decc9c9b5..113b79bc9f9 100644 --- a/bench/wtperf/runners/test3-1b-lsm.wtperf +++ b/bench/wtperf/runners/test3-1b-lsm.wtperf @@ -4,11 +4,11 @@ # This test assumes that a test1 populate already completed and exists. # #conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024,statistics=(fast,clear),statistics_log=(wait=60)" -conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024" +conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024,lsm_manager=(worker_thread_max=8)" compression="snappy" create=false sess_config="isolation=snapshot" -table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_max=5GB,chunk_size=100MB,merge_threads=3),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" +table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_max=5GB,chunk_size=100MB),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" key_sz=40 value_sz=1000 max_latency=2000 diff --git a/bench/wtperf/runners/test3-2b-lsm.wtperf b/bench/wtperf/runners/test3-2b-lsm.wtperf index 8c19799a509..574cf54b109 100644 --- a/bench/wtperf/runners/test3-2b-lsm.wtperf +++ b/bench/wtperf/runners/test3-2b-lsm.wtperf @@ -4,11 +4,11 @@ # This test assumes that a test1 populate already completed and exists. # #conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024,statistics=(fast,clear),statistics_log=(wait=60)" -conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024" +conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024,lsm_manager=(worker_thread_max=8)" compression="snappy" create=false sess_config="isolation=snapshot" -table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_max=20GB,chunk_size=100MB,merge_threads=4),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" +table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_max=20GB,chunk_size=100MB),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" key_sz=40 value_sz=1000 max_latency=2000 diff --git a/bench/wtperf/runners/test3-500m-lsm.wtperf b/bench/wtperf/runners/test3-500m-lsm.wtperf index a7f2520b12c..307d92b6db6 100644 --- a/bench/wtperf/runners/test3-500m-lsm.wtperf +++ b/bench/wtperf/runners/test3-500m-lsm.wtperf @@ -4,11 +4,11 @@ # This test assumes that a test1 populate already completed and exists. # #conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024,statistics=(fast,clear),statistics_log=(wait=60)" -conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024" +conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024,lsm_manager=(worker_thread_max=8)" create=false compression="snappy" sess_config="isolation=snapshot" -table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_max=5GB,chunk_size=100MB,merge_threads=3),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" +table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_max=5GB,chunk_size=100MB),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" key_sz=40 value_sz=1000 max_latency=2000 diff --git a/bench/wtperf/runners/test3-50m-lsm.wtperf b/bench/wtperf/runners/test3-50m-lsm.wtperf index 6b93486b3b1..278b1ce3872 100644 --- a/bench/wtperf/runners/test3-50m-lsm.wtperf +++ b/bench/wtperf/runners/test3-50m-lsm.wtperf @@ -4,10 +4,10 @@ # This test assumes that a test1 populate already completed and exists. # #conn_config="cache_size=10G,checkpoint_sync=false,mmap=false,session_max=1024,statistics=(fast,clear),statistics_log=(wait=30)" -conn_config="cache_size=10G,checkpoint_sync=false,mmap=false,session_max=1024" +conn_config="cache_size=10G,checkpoint_sync=false,mmap=false,session_max=1024,lsm_manager=(worker_thread_max=6)" create=false sess_config="isolation=snapshot" -table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_size=100MB,merge_threads=2),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" +table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_size=100MB),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" key_sz=40 value_sz=1000 max_latency=2000 diff --git a/bench/wtperf/runners/test4-1b-lsm.wtperf b/bench/wtperf/runners/test4-1b-lsm.wtperf index 8eddf04a5fe..848d4d7b7bc 100644 --- a/bench/wtperf/runners/test4-1b-lsm.wtperf +++ b/bench/wtperf/runners/test4-1b-lsm.wtperf @@ -8,7 +8,7 @@ conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024" compression="snappy" create=false sess_config="isolation=snapshot" -table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_max=5GB,chunk_size=100MB,merge_threads=3),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" +table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_max=5GB,chunk_size=100MB),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" key_sz=40 value_sz=1000 max_latency=2000 diff --git a/bench/wtperf/runners/test4-2b-lsm.wtperf b/bench/wtperf/runners/test4-2b-lsm.wtperf index 47f9e348544..b804d8aba9b 100644 --- a/bench/wtperf/runners/test4-2b-lsm.wtperf +++ b/bench/wtperf/runners/test4-2b-lsm.wtperf @@ -8,7 +8,7 @@ conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024" compression="snappy" create=false sess_config="isolation=snapshot" -table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_max=20GB,chunk_size=100MB,merge_threads=4),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" +table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_max=20GB,chunk_size=100MB),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" key_sz=40 value_sz=1000 max_latency=2000 diff --git a/bench/wtperf/runners/test4-500m-lsm.wtperf b/bench/wtperf/runners/test4-500m-lsm.wtperf index ad266f5e711..f73b62f0711 100644 --- a/bench/wtperf/runners/test4-500m-lsm.wtperf +++ b/bench/wtperf/runners/test4-500m-lsm.wtperf @@ -8,7 +8,7 @@ conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024" create=false compression="snappy" sess_config="isolation=snapshot" -table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_max=5GB,chunk_size=100MB,merge_threads=3),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" +table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_max=5GB,chunk_size=100MB),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" key_sz=40 value_sz=1000 max_latency=2000 diff --git a/bench/wtperf/runners/test4-50m-lsm.wtperf b/bench/wtperf/runners/test4-50m-lsm.wtperf index bfddec0f9bc..b686ee6ce6b 100644 --- a/bench/wtperf/runners/test4-50m-lsm.wtperf +++ b/bench/wtperf/runners/test4-50m-lsm.wtperf @@ -7,7 +7,7 @@ conn_config="cache_size=10G,checkpoint_sync=false,mmap=false,session_max=1024" create=false sess_config="isolation=snapshot" -table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_size=100MB,merge_threads=2),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" +table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_size=100MB),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" key_sz=40 value_sz=1000 max_latency=2000 diff --git a/bench/wtperf/runners/update-large-lsm.wtperf b/bench/wtperf/runners/update-large-lsm.wtperf index 7d56b219559..c3e468ec540 100644 --- a/bench/wtperf/runners/update-large-lsm.wtperf +++ b/bench/wtperf/runners/update-large-lsm.wtperf @@ -1,6 +1,6 @@ # wtperf options file: lsm with inserts/updates, in memory -conn_config="cache_size=2G" -table_config="lsm=(chunk_size=50MB,merge_threads=3),type=lsm,os_cache_dirty_max=16MB" +conn_config="cache_size=2G,lsm_manager=(worker_thread_max=6)" +table_config="lsm=(chunk_size=50MB),type=lsm,os_cache_dirty_max=16MB" icount=200000000 report_interval=5 run_time=1200 diff --git a/bench/wtperf/runners/update-lsm.wtperf b/bench/wtperf/runners/update-lsm.wtperf index d581ba07dc8..52c4fb0192a 100644 --- a/bench/wtperf/runners/update-lsm.wtperf +++ b/bench/wtperf/runners/update-lsm.wtperf @@ -1,6 +1,6 @@ # wtperf options file: lsm with inserts/updates, in memory -conn_config="cache_size=1G" -table_config="lsm=(chunk_size=20MB,merge_threads=2),type=lsm,os_cache_dirty_max=16MB" +conn_config="cache_size=1G,lsm_manager=(worker_thread_max=6)" +table_config="lsm=(chunk_size=20MB),type=lsm,os_cache_dirty_max=16MB" icount=5000000 report_interval=5 run_time=120 diff --git a/bench/wtperf/runners/voxer-10k-short.wtperf b/bench/wtperf/runners/voxer-10k-short.wtperf index 7b225810eeb..4f5789588be 100644 --- a/bench/wtperf/runners/voxer-10k-short.wtperf +++ b/bench/wtperf/runners/voxer-10k-short.wtperf @@ -7,7 +7,7 @@ conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024" compact=true compression="snappy" sess_config="isolation=snapshot" -table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_size=100MB,merge_threads=2),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" +table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_size=100MB),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" icount=15000 key_sz=40 value_sz=10000 diff --git a/bench/wtperf/runners/voxer-10k.wtperf b/bench/wtperf/runners/voxer-10k.wtperf index 6aa0c610344..3ced2919a70 100644 --- a/bench/wtperf/runners/voxer-10k.wtperf +++ b/bench/wtperf/runners/voxer-10k.wtperf @@ -7,7 +7,7 @@ conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024" compact=true compression="snappy" sess_config="isolation=snapshot" -table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_size=100MB,merge_threads=2),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" +table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_size=100MB),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" icount=15000 key_sz=40 value_sz=10000 diff --git a/bench/wtperf/runners/voxer-130k-short.wtperf b/bench/wtperf/runners/voxer-130k-short.wtperf index ac967abbfde..83f67062bf8 100644 --- a/bench/wtperf/runners/voxer-130k-short.wtperf +++ b/bench/wtperf/runners/voxer-130k-short.wtperf @@ -3,11 +3,11 @@ # specification of the data (count, size, threads) is from basho_bench. # #conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024,statistics=(fast,clear),statistics_log=(wait=600)" -conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024" +conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024,lsm_manager=(worker_thread_max=6)" compact=true compression="snappy" sess_config="isolation=snapshot" -table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_size=100MB,merge_threads=2),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" +table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_size=100MB),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" icount=15000 key_sz=40 value_sz=130000 diff --git a/bench/wtperf/runners/voxer-130k.wtperf b/bench/wtperf/runners/voxer-130k.wtperf index 1c7c4fe795f..a3439f0c575 100644 --- a/bench/wtperf/runners/voxer-130k.wtperf +++ b/bench/wtperf/runners/voxer-130k.wtperf @@ -3,11 +3,11 @@ # specification of the data (count, size, threads) is from basho_bench. # #conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024,statistics=(fast,clear),statistics_log=(wait=600)" -conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024" +conn_config="cache_size=21G,checkpoint_sync=false,mmap=false,session_max=1024,lsm_manager=(worker_thread_max=6)" compact=true compression="snappy" sess_config="isolation=snapshot" -table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_size=100MB,merge_threads=2),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" +table_config="internal_page_max=128K,lsm=(bloom_config=(leaf_page_max=8MB),bloom_bit_count=28,bloom_hash_count=19,bloom_oldest=true,chunk_size=100MB),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB" icount=15000 key_sz=40 value_sz=130000 |