WT-2828 wtperf long test changes (#2948)

* Set sample rate for every operation

* Set a smaller value size.

* Update table config to reflect MongoDB defaults.  Add eviction threads

* Set session max like MongoDB

* Update comments

* Fix runner script to take NOCREATE arg to run successive tests.

* Add warmup to long test configs

21 files changed, 54 insertions, 328 deletions

diff --git a/bench/wtperf/runners/1bn-lsm-50r50u.wtperf b/bench/wtperf/runners/1bn-lsm-50r50u.wtperf
deleted file mode 100644
index 2f09a63a0fd..00000000000
--- a/bench/wtperf/runners/1bn-lsm-50r50u.wtperf
+++ /dev/null
@@ -1,20 +0,0 @@
-# wtperf options file: simulate riak and its test3 configuration
-# The configuration for the connection and table are from riak and the
-# specification of the data (count, size, threads) is from basho_bench.
-# This test assumes that its correlating 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,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),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB"
-key_sz=40
-value_sz=1000
-max_latency=2000
-pareto=20
-report_interval=10
-run_time=14400
-sample_interval=10
-#threads=((count=20,reads=1,updates=1))
-threads=((count=10,reads=1),(count=10,updates=1))
diff --git a/bench/wtperf/runners/1bn-lsm-80r20u.wtperf b/bench/wtperf/runners/1bn-lsm-80r20u.wtperf
deleted file mode 100644
index 8139cdc16ea..00000000000
--- a/bench/wtperf/runners/1bn-lsm-80r20u.wtperf
+++ /dev/null
@@ -1,18 +0,0 @@
-# wtperf options file: simulate riak and its test2 configuration
-# The configuration for the connection and table are from riak and the
-# specification of the data (count, size, threads) is from basho_bench.
-# This test assumes that its correlating 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,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=5GB,chunk_size=100MB),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB"
-key_sz=40
-value_sz=1000
-max_latency=2000
-report_interval=10
-run_time=14400
-sample_interval=10
-threads=((count=20,reads=4,updates=1))
diff --git a/bench/wtperf/runners/1bn-lsm-populate.wtperf b/bench/wtperf/runners/1bn-lsm-populate.wtperf
deleted file mode 100644
index f25960f565a..00000000000
--- a/bench/wtperf/runners/1bn-lsm-populate.wtperf
+++ /dev/null
@@ -1,19 +0,0 @@
-# wtperf options file: simulate riak and its test1 configuration
-# The configuration for the connection and table are from riak and the
-# specification of the data (count, size, threads) is from basho_bench.
-# This task is the populate phase for its family of tests.
-#
-#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,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),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB"
-icount=1000000000
-key_sz=40
-value_sz=1000
-max_latency=2000
-populate_threads=20
-report_interval=10
-random_value=true
-sample_interval=10
diff --git a/bench/wtperf/runners/1bn-lsm-rdonly.wtperf b/bench/wtperf/runners/1bn-lsm-rdonly.wtperf
deleted file mode 100644
index 01cb4427a70..00000000000
--- a/bench/wtperf/runners/1bn-lsm-rdonly.wtperf
+++ /dev/null
@@ -1,18 +0,0 @@
-# wtperf options file: simulate riak and its test4 configuration
-# The configuration for the connection and table are from riak and the
-# specification of the data (count, size, threads) is from basho_bench.
-# This test assumes that its correlating 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,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=5GB,chunk_size=100MB),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB"
-key_sz=40
-value_sz=1000
-max_latency=2000
-report_interval=10
-run_time=14400
-sample_interval=10
-threads=((count=20,reads=1))
diff --git a/bench/wtperf/runners/2bn-lsm-50r50u.wtperf b/bench/wtperf/runners/2bn-lsm-50r50u.wtperf
deleted file mode 100644
index 13552d4c78e..00000000000
--- a/bench/wtperf/runners/2bn-lsm-50r50u.wtperf
+++ /dev/null
@@ -1,20 +0,0 @@
-# wtperf options file: simulate riak and its test3 configuration
-# The configuration for the connection and table are from riak and the
-# specification of the data (count, size, threads) is from basho_bench.
-# This test assumes that its correlating 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,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),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB"
-key_sz=40
-value_sz=1000
-max_latency=2000
-pareto=20
-report_interval=10
-run_time=14400
-sample_interval=10
-#threads=((count=20,reads=1,updates=1))
-threads=((count=10,reads=1),(count=10,updates=1))
diff --git a/bench/wtperf/runners/2bn-lsm-80r20u.wtperf b/bench/wtperf/runners/2bn-lsm-80r20u.wtperf
deleted file mode 100644
index 9d66019db24..00000000000
--- a/bench/wtperf/runners/2bn-lsm-80r20u.wtperf
+++ /dev/null
@@ -1,18 +0,0 @@
-# wtperf options file: simulate riak and its test2 configuration
-# The configuration for the connection and table are from riak and the
-# specification of the data (count, size, threads) is from basho_bench.
-# This test assumes that its correlating 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,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),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB"
-key_sz=40
-value_sz=1000
-max_latency=2000
-report_interval=10
-run_time=14400
-sample_interval=10
-threads=((count=20,reads=4,updates=1))
diff --git a/bench/wtperf/runners/2bn-lsm-populate.wtperf b/bench/wtperf/runners/2bn-lsm-populate.wtperf
deleted file mode 100644
index ad2ecaaa790..00000000000
--- a/bench/wtperf/runners/2bn-lsm-populate.wtperf
+++ /dev/null
@@ -1,19 +0,0 @@
-# wtperf options file: simulate riak and its test1 configuration
-# The configuration for the connection and table are from riak and the
-# specification of the data (count, size, threads) is from basho_bench.
-# This task is the populate phase for its family of tests.
-#
-#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,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),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB"
-icount=2000000000
-key_sz=40
-value_sz=1000
-max_latency=2000
-populate_threads=20
-report_interval=10
-random_value=true
-sample_interval=10
diff --git a/bench/wtperf/runners/2bn-lsm-rdonly.wtperf b/bench/wtperf/runners/2bn-lsm-rdonly.wtperf
deleted file mode 100644
index 64e64ab1f7e..00000000000
--- a/bench/wtperf/runners/2bn-lsm-rdonly.wtperf
+++ /dev/null
@@ -1,18 +0,0 @@
-# wtperf options file: simulate riak and its test4 configuration
-# The configuration for the connection and table are from riak and the
-# specification of the data (count, size, threads) is from basho_bench.
-# This test assumes that its correlating 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,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),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB"
-key_sz=40
-value_sz=1000
-max_latency=2000
-report_interval=10
-run_time=14400
-sample_interval=10
-threads=((count=20,reads=1))
diff --git a/bench/wtperf/runners/500m-btree-50r50u.wtperf b/bench/wtperf/runners/500m-btree-50r50u.wtperf
index 4ca956d2afe..06745bf7cca 100644
--- a/bench/wtperf/runners/500m-btree-50r50u.wtperf
+++ b/bench/wtperf/runners/500m-btree-50r50u.wtperf
@@ -1,19 +1,22 @@
-# wtperf options file: simulate riak and its test3 configuration
-# The configuration for the connection and table are from riak and the
-# specification of the data (count, size, threads) is from basho_bench.
+# wtperf options file: simulate MongoDB.
+# The configuration for the connection and table are from mongoDB.
+# We use multiple tables to simulate collections and indexes.
 # This test assumes that its correlating 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,log=(enabled),statistics=(fast),statistics_log=(wait=30)"
-checkpoint_interval=60
+# Set cache to half of memory of AWS perf instance.  Enable logging and
+# checkpoints.  Collect wiredtiger stats for ftdc.
+conn_config="cache_size=16G,checkpoint=(wait=60,log_size=2GB),session_max=20000,log=(enabled),statistics=(fast),statistics_log=(wait=30,json),eviction=(threads_max=4)"
 create=false
 compression="snappy"
 sess_config="isolation=snapshot"
+table_count=2
 key_sz=40
-value_sz=1000
+value_sz=120
 max_latency=2000
 pareto=20
 report_interval=10
 run_time=7200
 sample_interval=10
+sample_rate=1
 threads=((count=10,reads=1),(count=10,updates=1))
+warmup=120
diff --git a/bench/wtperf/runners/500m-btree-80r20u.wtperf b/bench/wtperf/runners/500m-btree-80r20u.wtperf
index 50488f72ead..77edbfb4941 100644
--- a/bench/wtperf/runners/500m-btree-80r20u.wtperf
+++ b/bench/wtperf/runners/500m-btree-80r20u.wtperf
@@ -1,18 +1,21 @@
-# wtperf options file: simulate riak and its test2 configuration
-# The configuration for the connection and table are from riak and the
-# specification of the data (count, size, threads) is from basho_bench.
+# wtperf options file: simulate MongoDB.
+# The configuration for the connection and table are from mongoDB.
+# We use multiple tables to simulate collections and indexes.
 # This test assumes that its correlating 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,log=(enabled),statistics=(fast),statistics_log=(wait=30)"
-checkpoint_interval=60
+# Set cache to half of memory of AWS perf instance.  Enable logging and
+# checkpoints.  Collect wiredtiger stats for ftdc.
+conn_config="cache_size=16G,checkpoint=(wait=60,log_size=2GB),session_max=20000,log=(enabled),statistics=(fast),statistics_log=(wait=30,json),eviction=(threads_max=4)"
 create=false
 compression="snappy"
 sess_config="isolation=snapshot
+table_count=2
 key_sz=40
-value_sz=1000
+value_sz=120
 max_latency=2000
 report_interval=10
 run_time=7200
 sample_interval=10
+sample_rate=1
 threads=((count=20,reads=4,updates=1))
+warmup=120
diff --git a/bench/wtperf/runners/500m-btree-populate.wtperf b/bench/wtperf/runners/500m-btree-populate.wtperf
index 9f34b8a8b1f..f9aed094aa1 100644
--- a/bench/wtperf/runners/500m-btree-populate.wtperf
+++ b/bench/wtperf/runners/500m-btree-populate.wtperf
@@ -1,20 +1,26 @@
-# wtperf options file: simulate riak and its test1 configuration
-# The configuration for the connection and table are from riak and the
-# specification of the data (count, size, threads) is from basho_bench.
-# This task is the populate phase for its family of tests.
+# wtperf options file: simulate MongoDB.
+# The configuration for the connection and table are from mongoDB.
+# We use multiple tables to simulate collections and indexes.
+# This test assumes that its correlating 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,log=(enabled),statistics=(fast),statistics_log=(wait=30)"
-checkpoint_interval=60
+# Set cache to half of memory.  This value is computed from the AWS instance
+# where Jenkins perf runs which has 32G.  Enable logging and checkpoints. 
+# Collect wiredtiger stats for ftdc.
+#
+# This generates about 80 Gb of uncompressed data.  But it should compress
+# well and be small on disk.
+conn_config="cache_size=16G,checkpoint=(wait=60,log_size=2GB),session_max=20000,log=(enabled),statistics=(fast),statistics_log=(wait=30,json),eviction=(threads_max=4)"
 compact=true
 compression="snappy"
 sess_config="isolation=snapshot"
-table_config="internal_page_max=128K,type=file,leaf_page_max=16K"
+table_config="internal_page_max=16K,type=file,leaf_page_max=16K,memory_page_max=10M,split_pct=90"
+table_count=2
 icount=500000000
 key_sz=40
-value_sz=1000
+value_sz=120
 max_latency=2000
 populate_threads=20
 report_interval=10
 random_value=true
 sample_interval=10
+sample_rate=1
diff --git a/bench/wtperf/runners/500m-btree-rdonly.wtperf b/bench/wtperf/runners/500m-btree-rdonly.wtperf
index 965306262a3..2c9540ff589 100644
--- a/bench/wtperf/runners/500m-btree-rdonly.wtperf
+++ b/bench/wtperf/runners/500m-btree-rdonly.wtperf
@@ -1,18 +1,21 @@
-# wtperf options file: simulate riak and its test4 configuration
-# The configuration for the connection and table are from riak and the
-# specification of the data (count, size, threads) is from basho_bench.
+# wtperf options file: simulate MongoDB.
+# The configuration for the connection and table are from mongoDB.
+# We use multiple tables to simulate collections and indexes.
 # This test assumes that its correlating 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,log=(enabled),statistics=(fast),statistics_log=(wait=30)"
-checkpoint_interval=60
+# Set cache to half of memory of AWS perf instance.  Enable logging and
+# checkpoints.  Collect wiredtiger stats for ftdc.
+conn_config="cache_size=16G,checkpoint=(wait=60,log_size=2GB),session_max=20000,log=(enabled),statistics=(fast),statistics_log=(wait=30,json),eviction=(threads_max=4)"
 create=false
 compression="snappy"
 sess_config="isolation=snapshot"
+table_count=2
 key_sz=40
-value_sz=1000
+value_sz=120
 max_latency=2000
 report_interval=10
 run_time=7200
 sample_interval=10
+sample_rate=1
 threads=((count=20,reads=1))
+warmup=120
diff --git a/bench/wtperf/runners/500m-lsm-50r50u.wtperf b/bench/wtperf/runners/500m-lsm-50r50u.wtperf
deleted file mode 100644
index bd79e508895..00000000000
--- a/bench/wtperf/runners/500m-lsm-50r50u.wtperf
+++ /dev/null
@@ -1,20 +0,0 @@
-# wtperf options file: simulate riak and its test3 configuration
-# The configuration for the connection and table are from riak and the
-# specification of the data (count, size, threads) is from basho_bench.
-# This test assumes that its correlating 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,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),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB"
-key_sz=40
-value_sz=1000
-max_latency=2000
-pareto=20
-report_interval=10
-run_time=14400
-sample_interval=10
-#threads=((count=20,reads=1,updates=1))
-threads=((count=10,reads=1),(count=10,updates=1))
diff --git a/bench/wtperf/runners/500m-lsm-80r20u.wtperf b/bench/wtperf/runners/500m-lsm-80r20u.wtperf
deleted file mode 100644
index e5ae5e66401..00000000000
--- a/bench/wtperf/runners/500m-lsm-80r20u.wtperf
+++ /dev/null
@@ -1,18 +0,0 @@
-# wtperf options file: simulate riak and its test2 configuration
-# The configuration for the connection and table are from riak and the
-# specification of the data (count, size, threads) is from basho_bench.
-# This test assumes that its correlating 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,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),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB"
-key_sz=40
-value_sz=1000
-max_latency=2000
-report_interval=10
-run_time=14400
-sample_interval=10
-threads=((count=20,reads=4,updates=1))
diff --git a/bench/wtperf/runners/500m-lsm-populate.wtperf b/bench/wtperf/runners/500m-lsm-populate.wtperf
deleted file mode 100644
index 1451fe3d673..00000000000
--- a/bench/wtperf/runners/500m-lsm-populate.wtperf
+++ /dev/null
@@ -1,19 +0,0 @@
-# wtperf options file: simulate riak and its test1 configuration
-# The configuration for the connection and table are from riak and the
-# specification of the data (count, size, threads) is from basho_bench.
-# This task is the populate phase for its family of tests.
-#
-#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,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),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB"
-icount=500000000
-key_sz=40
-value_sz=1000
-max_latency=2000
-populate_threads=20
-report_interval=10
-random_value=true
-sample_interval=10
diff --git a/bench/wtperf/runners/500m-lsm-rdonly.wtperf b/bench/wtperf/runners/500m-lsm-rdonly.wtperf
deleted file mode 100644
index af30affafb0..00000000000
--- a/bench/wtperf/runners/500m-lsm-rdonly.wtperf
+++ /dev/null
@@ -1,18 +0,0 @@
-# wtperf options file: simulate riak and its test4 configuration
-# The configuration for the connection and table are from riak and the
-# specification of the data (count, size, threads) is from basho_bench.
-# This test assumes that its correlating 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,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),type=lsm,leaf_page_max=16K,os_cache_dirty_max=16MB"
-key_sz=40
-value_sz=1000
-max_latency=2000
-report_interval=10
-run_time=14400
-sample_interval=10
-threads=((count=20,reads=1))
diff --git a/bench/wtperf/runners/50m-lsm-50r50u.wtperf b/bench/wtperf/runners/50m-lsm-50r50u.wtperf
deleted file mode 100644
index 07add74eb6d..00000000000
--- a/bench/wtperf/runners/50m-lsm-50r50u.wtperf
+++ /dev/null
@@ -1,19 +0,0 @@
-# wtperf options file: simulate riak and its test3 configuration
-# The configuration for the connection and table are from riak and the
-# specification of the data (count, size, threads) is from basho_bench.
-# This test assumes that its correlating 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,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"
-key_sz=40
-value_sz=1000
-max_latency=2000
-pareto=20
-report_interval=10
-run_time=1440
-sample_interval=10
-#threads=((count=10,reads=1,updates=1))
-threads=((count=5,reads=1),(count=5,updates=1))
diff --git a/bench/wtperf/runners/50m-lsm-80r20u.wtperf b/bench/wtperf/runners/50m-lsm-80r20u.wtperf
deleted file mode 100644
index 96c51ef5fa7..00000000000
--- a/bench/wtperf/runners/50m-lsm-80r20u.wtperf
+++ /dev/null
@@ -1,17 +0,0 @@
-# wtperf options file: simulate riak and its test2 configuration
-# The configuration for the connection and table are from riak and the
-# specification of the data (count, size, threads) is from basho_bench.
-# This test assumes that its correlating 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,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"
-key_sz=40
-value_sz=1000
-max_latency=2000
-report_interval=10
-run_time=1440
-sample_interval=10
-threads=((count=10,reads=4,updates=1))
diff --git a/bench/wtperf/runners/50m-lsm-populate.wtperf b/bench/wtperf/runners/50m-lsm-populate.wtperf
deleted file mode 100644
index 6893abec007..00000000000
--- a/bench/wtperf/runners/50m-lsm-populate.wtperf
+++ /dev/null
@@ -1,18 +0,0 @@
-# wtperf options file: simulate riak and its test1 configuration
-# The configuration for the connection and table are from riak and the
-# specification of the data (count, size, threads) is from basho_bench.
-# This task is the populate phase for its family of tests.
-#
-#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"
-icount=50000000
-key_sz=40
-value_sz=1000
-max_latency=2000
-populate_threads=10
-report_interval=10
-random_value=true
-sample_interval=10
diff --git a/bench/wtperf/runners/50m-lsm-rdonly.wtperf b/bench/wtperf/runners/50m-lsm-rdonly.wtperf
deleted file mode 100644
index 53b38f20c51..00000000000
--- a/bench/wtperf/runners/50m-lsm-rdonly.wtperf
+++ /dev/null
@@ -1,17 +0,0 @@
-# wtperf options file: simulate riak and its test4 configuration
-# The configuration for the connection and table are from riak and the
-# specification of the data (count, size, threads) is from basho_bench.
-# This test assumes that its correlating 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,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"
-key_sz=40
-value_sz=1000
-max_latency=2000
-report_interval=10
-run_time=1440
-sample_interval=10
-threads=((count=10,reads=1))
diff --git a/bench/wtperf/runners/wtperf_run.sh b/bench/wtperf/runners/wtperf_run.sh
index 7de3bd3384a..9968edc468a 100755
--- a/bench/wtperf/runners/wtperf_run.sh
+++ b/bench/wtperf/runners/wtperf_run.sh
@@ -22,11 +22,16 @@ runmax=$2
 # have 3 or 4 args.
 wtarg=""
 wtarg2=""
+create=1
 if test "$#" -gt "2"; then
 	wtarg=$3
 	if test "$#" -eq "4"; then
 		wtarg2=$4
 	fi
+	if test "$wtarg" == "NOCREATE"; then
+		create=0
+		wtarg=$wtarg2
+	fi
 fi
 
 home=./WT_TEST
@@ -86,8 +91,10 @@ getmin=0
 getmax=1
 run=1
 while test "$run" -le "$runmax"; do
-	rm -rf $home
-	mkdir $home
+	if test "$create" -eq "1"; then
+		rm -rf $home
+		mkdir $home
+	fi
 	LD_PRELOAD=/usr/local/lib/libtcmalloc.so LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib ./wtperf -O $wttest $wtarg $wtarg2
 	if test "$?" -ne "0"; then
 		exit 1