Make sure all LSM tests have 6 threads, resulting in at least 2 merge

threads.  #1251

15 files changed, 16 insertions, 16 deletions

diff --git a/bench/wtperf/runners/evict-lsm.wtperf b/bench/wtperf/runners/evict-lsm.wtperf
index 7fcaaba42aa..962f6a60201 100644
--- a/bench/wtperf/runners/evict-lsm.wtperf
+++ b/bench/wtperf/runners/evict-lsm.wtperf
@@ -1,5 +1,5 @@
 # wtperf options file: evict lsm configuration
-conn_config="cache_size=50M"
+conn_config="cache_size=50M,lsm_manager=(worker_thread_max=6)"
 table_config="type=lsm,os_cache_dirty_max=16MB"
 compact=true
 icount=10000000
diff --git a/bench/wtperf/runners/fruit-short.wtperf b/bench/wtperf/runners/fruit-short.wtperf
index e28b100b23a..a2ea535b4c5 100644
--- a/bench/wtperf/runners/fruit-short.wtperf
+++ b/bench/wtperf/runners/fruit-short.wtperf
@@ -3,7 +3,7 @@
 # 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
 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),type=lsm,leaf_page_max=16K"
diff --git a/bench/wtperf/runners/large-lsm.wtperf b/bench/wtperf/runners/large-lsm.wtperf
index ede53b5b26c..4b41b3fc84a 100644
--- a/bench/wtperf/runners/large-lsm.wtperf
+++ b/bench/wtperf/runners/large-lsm.wtperf
@@ -1,5 +1,5 @@
 # wtperf options file: large lsm configuration
-conn_config="cache_size=20G,mmap=false"
+conn_config="cache_size=20G,mmap=false,lsm_manager=(worker_thread_max=8)"
 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"
diff --git a/bench/wtperf/runners/medium-lsm-async.wtperf b/bench/wtperf/runners/medium-lsm-async.wtperf
index 07ffd3d84d4..1d729bcee23 100644
--- a/bench/wtperf/runners/medium-lsm-async.wtperf
+++ b/bench/wtperf/runners/medium-lsm-async.wtperf
@@ -1,5 +1,5 @@
 # wtperf options file: medium lsm configuration using async operations
-conn_config="cache_size=1G"
+conn_config="cache_size=1G,lsm_manager=(worker_thread_max=6)"
 async_threads=10
 table_config="lsm=(chunk_size=100MB),type=lsm,os_cache_dirty_max=16MB"
 icount=50000000
diff --git a/bench/wtperf/runners/medium-lsm-compact.wtperf b/bench/wtperf/runners/medium-lsm-compact.wtperf
index 9b31e256ea7..0d4a6f965d1 100644
--- a/bench/wtperf/runners/medium-lsm-compact.wtperf
+++ b/bench/wtperf/runners/medium-lsm-compact.wtperf
@@ -1,5 +1,5 @@
 # wtperf options file: medium lsm configuration
-conn_config="cache_size=1G"
+conn_config="cache_size=1G,lsm_manager=(worker_thread_max=6)"
 table_config="lsm=(chunk_size=100MB,chunk_max=1TB),type=lsm,os_cache_dirty_max=16MB"
 icount=50000000
 populate_threads=1
diff --git a/bench/wtperf/runners/medium-lsm.wtperf b/bench/wtperf/runners/medium-lsm.wtperf
index 08ee2d9197c..3e676dc0b70 100644
--- a/bench/wtperf/runners/medium-lsm.wtperf
+++ b/bench/wtperf/runners/medium-lsm.wtperf
@@ -1,5 +1,5 @@
 # wtperf options file: medium lsm configuration
-conn_config="cache_size=1G"
+conn_config="cache_size=1G,lsm_manager=(worker_thread_max=6)"
 table_config="lsm=(chunk_size=100MB),type=lsm,os_cache_dirty_max=16MB"
 icount=50000000
 report_interval=5
diff --git a/bench/wtperf/runners/test1-50m-lsm.wtperf b/bench/wtperf/runners/test1-50m-lsm.wtperf
index 3bb72adf9ef..229455d62a1 100644
--- a/bench/wtperf/runners/test1-50m-lsm.wtperf
+++ b/bench/wtperf/runners/test1-50m-lsm.wtperf
@@ -2,8 +2,8 @@
 # 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=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,statistics=(fast,clear),statistics_log=(wait=30),lsm_manager=(worker_thread_max=6)"
+conn_config="cache_size=10G,checkpoint_sync=false,mmap=false,session_max=1024,lsm_manager=(worker_thread_max=6)"
 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),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB"
diff --git a/bench/wtperf/runners/test2-1b-lsm.wtperf b/bench/wtperf/runners/test2-1b-lsm.wtperf
index 63f8f31c1e6..42452092dfc 100644
--- a/bench/wtperf/runners/test2-1b-lsm.wtperf
+++ b/bench/wtperf/runners/test2-1b-lsm.wtperf
@@ -4,7 +4,7 @@
 # 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"
diff --git a/bench/wtperf/runners/test2-50m-lsm.wtperf b/bench/wtperf/runners/test2-50m-lsm.wtperf
index 5ad86f270a3..51a06d84222 100644
--- a/bench/wtperf/runners/test2-50m-lsm.wtperf
+++ b/bench/wtperf/runners/test2-50m-lsm.wtperf
@@ -4,7 +4,7 @@
 # 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),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB"
diff --git a/bench/wtperf/runners/test4-1b-lsm.wtperf b/bench/wtperf/runners/test4-1b-lsm.wtperf
index 848d4d7b7bc..8ff3cadbe59 100644
--- a/bench/wtperf/runners/test4-1b-lsm.wtperf
+++ b/bench/wtperf/runners/test4-1b-lsm.wtperf
@@ -4,7 +4,7 @@
 # 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"
diff --git a/bench/wtperf/runners/test4-2b-lsm.wtperf b/bench/wtperf/runners/test4-2b-lsm.wtperf
index b804d8aba9b..d8f02872feb 100644
--- a/bench/wtperf/runners/test4-2b-lsm.wtperf
+++ b/bench/wtperf/runners/test4-2b-lsm.wtperf
@@ -4,7 +4,7 @@
 # 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"
diff --git a/bench/wtperf/runners/test4-500m-lsm.wtperf b/bench/wtperf/runners/test4-500m-lsm.wtperf
index f73b62f0711..19e6f84c9dc 100644
--- a/bench/wtperf/runners/test4-500m-lsm.wtperf
+++ b/bench/wtperf/runners/test4-500m-lsm.wtperf
@@ -4,7 +4,7 @@
 # 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"
diff --git a/bench/wtperf/runners/test4-50m-lsm.wtperf b/bench/wtperf/runners/test4-50m-lsm.wtperf
index b686ee6ce6b..f716a97943f 100644
--- a/bench/wtperf/runners/test4-50m-lsm.wtperf
+++ b/bench/wtperf/runners/test4-50m-lsm.wtperf
@@ -4,7 +4,7 @@
 # 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),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB"
diff --git a/bench/wtperf/runners/voxer-10k-short.wtperf b/bench/wtperf/runners/voxer-10k-short.wtperf
index 4f5789588be..47228079db8 100644
--- a/bench/wtperf/runners/voxer-10k-short.wtperf
+++ b/bench/wtperf/runners/voxer-10k-short.wtperf
@@ -3,7 +3,7 @@
 # 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"
diff --git a/bench/wtperf/runners/voxer-10k.wtperf b/bench/wtperf/runners/voxer-10k.wtperf
index 3ced2919a70..9b4ed2acaee 100644
--- a/bench/wtperf/runners/voxer-10k.wtperf
+++ b/bench/wtperf/runners/voxer-10k.wtperf
@@ -3,7 +3,7 @@
 # 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"