Import wiredtiger-wiredtiger-2.6.1-59-g1d2fe8a.tar.gz from wiredtiger branch mongodb-3.2

10 files changed, 47 insertions, 0 deletions

diff --git a/src/third_party/wiredtiger/bench/wtperf/runners/evict-btree.wtperf b/src/third_party/wiredtiger/bench/wtperf/runners/evict-btree.wtperf
index f8c270f3d1f..24da4dd7902 100644
--- a/src/third_party/wiredtiger/bench/wtperf/runners/evict-btree.wtperf
+++ b/src/third_party/wiredtiger/bench/wtperf/runners/evict-btree.wtperf
@@ -6,3 +6,6 @@ report_interval=5
 run_time=120
 populate_threads=1
 threads=((count=16,reads=1))
+# Add throughput/latency monitoring
+max_latency=2000
+sample_interval=5
diff --git a/src/third_party/wiredtiger/bench/wtperf/runners/evict-lsm.wtperf b/src/third_party/wiredtiger/bench/wtperf/runners/evict-lsm.wtperf
index c51cb7859c1..ad885d98eb7 100644
--- a/src/third_party/wiredtiger/bench/wtperf/runners/evict-lsm.wtperf
+++ b/src/third_party/wiredtiger/bench/wtperf/runners/evict-lsm.wtperf
@@ -7,3 +7,6 @@ report_interval=5
 run_time=120
 populate_threads=1
 threads=((count=16,reads=1))
+# Add throughput/latency monitoring
+max_latency=2000
+sample_interval=5
diff --git a/src/third_party/wiredtiger/bench/wtperf/runners/medium-btree.wtperf b/src/third_party/wiredtiger/bench/wtperf/runners/medium-btree.wtperf
index 92c63e73480..ea182ef5144 100644
--- a/src/third_party/wiredtiger/bench/wtperf/runners/medium-btree.wtperf
+++ b/src/third_party/wiredtiger/bench/wtperf/runners/medium-btree.wtperf
@@ -6,3 +6,6 @@ report_interval=5
 run_time=120
 populate_threads=1
 threads=((count=16,reads=1))
+# Add throughput/latency monitoring
+max_latency=2000
+sample_interval=5
diff --git a/src/third_party/wiredtiger/bench/wtperf/runners/medium-lsm-async.wtperf b/src/third_party/wiredtiger/bench/wtperf/runners/medium-lsm-async.wtperf
index 1d729bcee23..2661fe0b14b 100644
--- a/src/third_party/wiredtiger/bench/wtperf/runners/medium-lsm-async.wtperf
+++ b/src/third_party/wiredtiger/bench/wtperf/runners/medium-lsm-async.wtperf
@@ -7,3 +7,6 @@ report_interval=5
 run_time=120
 populate_threads=1
 threads=((count=5,reads=1,updates=2))
+# Add throughput/latency monitoring
+max_latency=2000
+sample_interval=5
diff --git a/src/third_party/wiredtiger/bench/wtperf/runners/medium-lsm.wtperf b/src/third_party/wiredtiger/bench/wtperf/runners/medium-lsm.wtperf
index 3e676dc0b70..33c652c65fe 100644
--- a/src/third_party/wiredtiger/bench/wtperf/runners/medium-lsm.wtperf
+++ b/src/third_party/wiredtiger/bench/wtperf/runners/medium-lsm.wtperf
@@ -6,3 +6,6 @@ report_interval=5
 run_time=120
 populate_threads=1
 threads=((count=16,reads=1))
+# Add throughput/latency monitoring
+max_latency=2000
+sample_interval=5
diff --git a/src/third_party/wiredtiger/bench/wtperf/runners/medium-multi-btree-log-partial.wtperf b/src/third_party/wiredtiger/bench/wtperf/runners/medium-multi-btree-log-partial.wtperf
new file mode 100644
index 00000000000..513c1387665
--- /dev/null
+++ b/src/third_party/wiredtiger/bench/wtperf/runners/medium-multi-btree-log-partial.wtperf
@@ -0,0 +1,12 @@
+# wtperf options file: medium lsm configuration, with multiple tables.
+conn_config="cache_size=1G,log=(enabled,file_max=10MB)"
+table_config="type=file,os_cache_dirty_max=16MB"
+icount=5000000
+log_partial=true
+populate_threads=5
+populate_ops_per_txn=100
+threads=((count=1,read=1),(count=1,update=1))
+#threads=((count=8,read=1))
+run_time=120
+report_interval=5
+table_count=4
diff --git a/src/third_party/wiredtiger/bench/wtperf/runners/medium-multi-btree-log.wtperf b/src/third_party/wiredtiger/bench/wtperf/runners/medium-multi-btree-log.wtperf
new file mode 100644
index 00000000000..d0a2e913186
--- /dev/null
+++ b/src/third_party/wiredtiger/bench/wtperf/runners/medium-multi-btree-log.wtperf
@@ -0,0 +1,11 @@
+# wtperf options file: medium lsm configuration, with multiple tables.
+conn_config="cache_size=1G,log=(enabled,file_max=10MB)"
+table_config="type=file,os_cache_dirty_max=16MB"
+icount=5000000
+populate_threads=5
+populate_ops_per_txn=100
+#threads=((count=1,read=1),(count=1,update=1))
+threads=((count=8,read=1))
+run_time=120
+report_interval=5
+table_count=4
diff --git a/src/third_party/wiredtiger/bench/wtperf/runners/medium-multi-lsm.wtperf b/src/third_party/wiredtiger/bench/wtperf/runners/medium-multi-lsm.wtperf
index d8433352311..362bc8e00e8 100644
--- a/src/third_party/wiredtiger/bench/wtperf/runners/medium-multi-lsm.wtperf
+++ b/src/third_party/wiredtiger/bench/wtperf/runners/medium-multi-lsm.wtperf
@@ -8,3 +8,6 @@ threads=((count=8,read=1),(count=8,update=1))
 run_time=180
 report_interval=5
 table_count=4
+# Add throughput/latency monitoring
+max_latency=2000
+sample_interval=5
diff --git a/src/third_party/wiredtiger/bench/wtperf/runners/update-checkpoint-btree.wtperf b/src/third_party/wiredtiger/bench/wtperf/runners/update-checkpoint-btree.wtperf
index a2e4caab159..76cc63451d8 100644
--- a/src/third_party/wiredtiger/bench/wtperf/runners/update-checkpoint-btree.wtperf
+++ b/src/third_party/wiredtiger/bench/wtperf/runners/update-checkpoint-btree.wtperf
@@ -10,3 +10,6 @@ checkpoint_interval=10
 run_time=300
 populate_threads=1
 threads=((count=1,inserts=1),(count=2,reads=1),(count=2,updates=1))
+# Add throughput/latency monitoring
+max_latency=2000
+sample_interval=5
diff --git a/src/third_party/wiredtiger/bench/wtperf/runners/update-checkpoint-lsm.wtperf b/src/third_party/wiredtiger/bench/wtperf/runners/update-checkpoint-lsm.wtperf
index ebd95db910f..8a195fb1e93 100644
--- a/src/third_party/wiredtiger/bench/wtperf/runners/update-checkpoint-lsm.wtperf
+++ b/src/third_party/wiredtiger/bench/wtperf/runners/update-checkpoint-lsm.wtperf
@@ -10,3 +10,6 @@ checkpoint_interval=10
 run_time=300
 populate_threads=1
 threads=((count=1,inserts=1),(count=2,reads=1),(count=2,updates=1))
+# Add throughput/latency monitoring
+max_latency=2000
+sample_interval=5