WT-2949 Add option to skip closing the connection after test runs. (#3082)

* WT-2949 Add option to skip closing the connection after test runs.

* Reverse the default value per review comments and add where needed to
configs.

* Add additional text/comments for new option.

6 files changed, 12 insertions, 1 deletions

diff --git a/bench/wtperf/runners/500m-btree-50r50u.wtperf b/bench/wtperf/runners/500m-btree-50r50u.wtperf
index 06745bf7cca..536127f0dd8 100644
--- a/bench/wtperf/runners/500m-btree-50r50u.wtperf
+++ b/bench/wtperf/runners/500m-btree-50r50u.wtperf
@@ -10,6 +10,9 @@ create=false
 compression="snappy"
 sess_config="isolation=snapshot"
 table_count=2
+# close_conn as false allows this test to close/finish faster, but if running
+# as the set, the next test will need to run recovery.
+close_conn=false
 key_sz=40
 value_sz=120
 max_latency=2000
diff --git a/bench/wtperf/runners/500m-btree-80r20u.wtperf b/bench/wtperf/runners/500m-btree-80r20u.wtperf
index 77edbfb4941..d6218c44af0 100644
--- a/bench/wtperf/runners/500m-btree-80r20u.wtperf
+++ b/bench/wtperf/runners/500m-btree-80r20u.wtperf
@@ -8,6 +8,9 @@
 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"
+# close_conn as false allows this test to close/finish faster, but if running
+# as the set, the next test will need to run recovery.
+close_conn=false
 sess_config="isolation=snapshot
 table_count=2
 key_sz=40
diff --git a/bench/wtperf/runners/checkpoint-stress.wtperf b/bench/wtperf/runners/checkpoint-stress.wtperf
index 0c98a0c2db0..bbd3a3ba5ed 100644
--- a/bench/wtperf/runners/checkpoint-stress.wtperf
+++ b/bench/wtperf/runners/checkpoint-stress.wtperf
@@ -4,6 +4,7 @@ conn_config="cache_size=16GB,eviction=(threads_max=4),log=(enabled=false)"
 table_config="leaf_page_max=32k,internal_page_max=16k,allocation_size=4k,split_pct=90,type=file"
 # Enough data to fill the cache. 150 million 1k records results in two ~11GB
 # tables
+close_conn=false
 icount=150000000
 create=true
 compression="snappy"
diff --git a/bench/wtperf/runners/evict-btree-stress-multi.wtperf b/bench/wtperf/runners/evict-btree-stress-multi.wtperf
index 9699b9ae3bb..a5a29f66fa0 100644
--- a/bench/wtperf/runners/evict-btree-stress-multi.wtperf
+++ b/bench/wtperf/runners/evict-btree-stress-multi.wtperf
@@ -1,6 +1,7 @@
 conn_config="cache_size=1G,eviction=(threads_max=4),session_max=2000"
 table_config="type=file"
 table_count=100
+close_conn=false
 icount=100000000
 report_interval=5
 run_time=600
diff --git a/bench/wtperf/wtperf.c b/bench/wtperf/wtperf.c
index adddf60f5d3..a1dc78a5312 100644
--- a/bench/wtperf/wtperf.c
+++ b/bench/wtperf/wtperf.c
@@ -2300,7 +2300,7 @@ err:		if (ret == 0)
 			ret = t_ret;
 	}
 
-	if (wtperf->conn != NULL &&
+	if (wtperf->conn != NULL && opts->close_conn &&
 	    (t_ret = wtperf->conn->close(wtperf->conn, NULL)) != 0) {
 		lprintf(wtperf, t_ret, 0,
 		    "Error closing connection to %s", wtperf->home);
diff --git a/bench/wtperf/wtperf_opt.i b/bench/wtperf/wtperf_opt.i
index 5a632f26faa..d2d255b38c2 100644
--- a/bench/wtperf/wtperf_opt.i
+++ b/bench/wtperf/wtperf_opt.i
@@ -94,6 +94,9 @@ DEF_OPT_AS_UINT32(checkpoint_stress_rate, 0,
 DEF_OPT_AS_UINT32(checkpoint_threads, 0, "number of checkpoint threads")
 DEF_OPT_AS_CONFIG_STRING(conn_config, "create",
     "connection configuration string")
+DEF_OPT_AS_BOOL(close_conn, 1, "properly close connection at end of test. "
+    "Setting to false does not sync data to disk and can result in lost "
+    "data after test exits.")
 DEF_OPT_AS_BOOL(compact, 0, "post-populate compact for LSM merging activity")
 DEF_OPT_AS_STRING(compression, "none",
     "compression extension.  Allowed configuration values are: "