Re-organize and rename WT riak/basho tests.

20 files changed, 20 insertions, 15 deletions

diff --git a/bench/wtperf/runners/test3-1b-lsm.wtperf b/bench/wtperf/runners/1bn-lsm-50r50u.wtperf
index e7a888fa73b..2f09a63a0fd 100644
--- a/bench/wtperf/runners/test3-1b-lsm.wtperf
+++ b/bench/wtperf/runners/1bn-lsm-50r50u.wtperf
@@ -1,7 +1,7 @@
 # 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 a test1 populate already completed and exists.
+# 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)"
diff --git a/bench/wtperf/runners/test2-1b-lsm.wtperf b/bench/wtperf/runners/1bn-lsm-80r20u.wtperf
index 42452092dfc..a5993b16943 100644
--- a/bench/wtperf/runners/test2-1b-lsm.wtperf
+++ b/bench/wtperf/runners/1bn-lsm-80r20u.wtperf
@@ -1,7 +1,7 @@
 # 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 a test1 populate already completed and exists.
+# This test assumes that its correlatin  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)"
diff --git a/bench/wtperf/runners/test1-1b-lsm.wtperf b/bench/wtperf/runners/1bn-lsm-populate.wtperf
index 662a286970c..f25960f565a 100644
--- a/bench/wtperf/runners/test1-1b-lsm.wtperf
+++ b/bench/wtperf/runners/1bn-lsm-populate.wtperf
@@ -1,6 +1,7 @@
 # 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)"
diff --git a/bench/wtperf/runners/test4-1b-lsm.wtperf b/bench/wtperf/runners/1bn-lsm-rdonly.wtperf
index 8ff3cadbe59..01cb4427a70 100644
--- a/bench/wtperf/runners/test4-1b-lsm.wtperf
+++ b/bench/wtperf/runners/1bn-lsm-rdonly.wtperf
@@ -1,7 +1,7 @@
 # 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 a test1 populate already completed and exists.
+# 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)"
diff --git a/bench/wtperf/runners/test3-2b-lsm.wtperf b/bench/wtperf/runners/2bn-lsm-50r50u.wtperf
index c9298756ac8..13552d4c78e 100644
--- a/bench/wtperf/runners/test3-2b-lsm.wtperf
+++ b/bench/wtperf/runners/2bn-lsm-50r50u.wtperf
@@ -1,7 +1,7 @@
 # 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 a test1 populate already completed and exists.
+# 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)"
diff --git a/bench/wtperf/runners/test2-2b-lsm.wtperf b/bench/wtperf/runners/2bn-lsm-80r20u.wtperf
index 7fc1155bcb2..9d66019db24 100644
--- a/bench/wtperf/runners/test2-2b-lsm.wtperf
+++ b/bench/wtperf/runners/2bn-lsm-80r20u.wtperf
@@ -1,7 +1,7 @@
 # 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 a test1 populate already completed and exists.
+# 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)"
diff --git a/bench/wtperf/runners/test1-2b-lsm.wtperf b/bench/wtperf/runners/2bn-lsm-populate.wtperf
index 2a3923e62ab..ad2ecaaa790 100644
--- a/bench/wtperf/runners/test1-2b-lsm.wtperf
+++ b/bench/wtperf/runners/2bn-lsm-populate.wtperf
@@ -1,6 +1,7 @@
 # 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)"
diff --git a/bench/wtperf/runners/test4-2b-lsm.wtperf b/bench/wtperf/runners/2bn-lsm-rdonly.wtperf
index d8f02872feb..64e64ab1f7e 100644
--- a/bench/wtperf/runners/test4-2b-lsm.wtperf
+++ b/bench/wtperf/runners/2bn-lsm-rdonly.wtperf
@@ -1,7 +1,7 @@
 # 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 a test1 populate already completed and exists.
+# 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)"
diff --git a/bench/wtperf/runners/test3-500m-btree.wtperf b/bench/wtperf/runners/500m-btree-50r50u.wtperf
index d6e3c57e8ae..9975c46a2b8 100644
--- a/bench/wtperf/runners/test3-500m-btree.wtperf
+++ b/bench/wtperf/runners/500m-btree-50r50u.wtperf
@@ -1,7 +1,7 @@
 # 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 a test1 populate already completed and exists.
+# 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),checkpoint=(wait=60),statistics=(fast),statistics_log=(wait=30)"
diff --git a/bench/wtperf/runners/test2-500m-btree.wtperf b/bench/wtperf/runners/500m-btree-80r20u.wtperf
index 71a9d7b6ae5..1aaefc86ac1 100644
--- a/bench/wtperf/runners/test2-500m-btree.wtperf
+++ b/bench/wtperf/runners/500m-btree-80r20u.wtperf
@@ -1,7 +1,7 @@
 # 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 a test1 populate already completed and exists.
+# 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),checkpoint=(wait=60),statistics=(fast),statistics_log=(wait=30)"
diff --git a/bench/wtperf/runners/test1-500m-btree.wtperf b/bench/wtperf/runners/500m-btree-populate.wtperf
index e3d0f398615..78fd9b70f25 100644
--- a/bench/wtperf/runners/test1-500m-btree.wtperf
+++ b/bench/wtperf/runners/500m-btree-populate.wtperf
@@ -1,6 +1,7 @@
 # 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,log=(enabled),checkpoint=(wait=60),statistics=(fast),statistics_log=(wait=30)"
diff --git a/bench/wtperf/runners/test4-500m-btree.wtperf b/bench/wtperf/runners/500m-btree-rdonly.wtperf
index bfacf9b4e46..d2ba9025714 100644
--- a/bench/wtperf/runners/test4-500m-btree.wtperf
+++ b/bench/wtperf/runners/500m-btree-rdonly.wtperf
@@ -1,7 +1,7 @@
 # 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 a test1 populate already completed and exists.
+# 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),checkpoint=(wait=60),statistics=(fast),statistics_log=(wait=30)"
diff --git a/bench/wtperf/runners/test3-500m-lsm.wtperf b/bench/wtperf/runners/500m-lsm-50r50u.wtperf
index cc51f9c0b76..bd79e508895 100644
--- a/bench/wtperf/runners/test3-500m-lsm.wtperf
+++ b/bench/wtperf/runners/500m-lsm-50r50u.wtperf
@@ -1,7 +1,7 @@
 # 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 a test1 populate already completed and exists.
+# 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)"
diff --git a/bench/wtperf/runners/test2-500m-lsm.wtperf b/bench/wtperf/runners/500m-lsm-80r20u.wtperf
index c03f5041a4d..e5ae5e66401 100644
--- a/bench/wtperf/runners/test2-500m-lsm.wtperf
+++ b/bench/wtperf/runners/500m-lsm-80r20u.wtperf
@@ -1,7 +1,7 @@
 # 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 a test1 populate already completed and exists.
+# 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)"
diff --git a/bench/wtperf/runners/test1-500m-lsm.wtperf b/bench/wtperf/runners/500m-lsm-populate.wtperf
index 91c7858a605..1451fe3d673 100644
--- a/bench/wtperf/runners/test1-500m-lsm.wtperf
+++ b/bench/wtperf/runners/500m-lsm-populate.wtperf
@@ -1,6 +1,7 @@
 # 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)"
diff --git a/bench/wtperf/runners/test4-500m-lsm.wtperf b/bench/wtperf/runners/500m-lsm-rdonly.wtperf
index 19e6f84c9dc..af30affafb0 100644
--- a/bench/wtperf/runners/test4-500m-lsm.wtperf
+++ b/bench/wtperf/runners/500m-lsm-rdonly.wtperf
@@ -1,7 +1,7 @@
 # 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 a test1 populate already completed and exists.
+# 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)"
diff --git a/bench/wtperf/runners/test3-50m-lsm.wtperf b/bench/wtperf/runners/50m-lsm-50r50u.wtperf
index 89a85394594..07add74eb6d 100644
--- a/bench/wtperf/runners/test3-50m-lsm.wtperf
+++ b/bench/wtperf/runners/50m-lsm-50r50u.wtperf
@@ -1,7 +1,7 @@
 # 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 a test1 populate already completed and exists.
+# 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)"
diff --git a/bench/wtperf/runners/test2-50m-lsm.wtperf b/bench/wtperf/runners/50m-lsm-80r20u.wtperf
index 51a06d84222..96c51ef5fa7 100644
--- a/bench/wtperf/runners/test2-50m-lsm.wtperf
+++ b/bench/wtperf/runners/50m-lsm-80r20u.wtperf
@@ -1,7 +1,7 @@
 # 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 a test1 populate already completed and exists.
+# 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)"
diff --git a/bench/wtperf/runners/test1-50m-lsm.wtperf b/bench/wtperf/runners/50m-lsm-populate.wtperf
index 229455d62a1..6893abec007 100644
--- a/bench/wtperf/runners/test1-50m-lsm.wtperf
+++ b/bench/wtperf/runners/50m-lsm-populate.wtperf
@@ -1,6 +1,7 @@
 # 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)"
diff --git a/bench/wtperf/runners/test4-50m-lsm.wtperf b/bench/wtperf/runners/50m-lsm-rdonly.wtperf
index f716a97943f..53b38f20c51 100644
--- a/bench/wtperf/runners/test4-50m-lsm.wtperf
+++ b/bench/wtperf/runners/50m-lsm-rdonly.wtperf
@@ -1,7 +1,7 @@
 # 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 a test1 populate already completed and exists.
+# 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)"