summaryrefslogtreecommitdiff
path: root/bench
diff options
context:
space:
mode:
authorAlex Gorrod <alexg@wiredtiger.com>2014-03-19 17:12:16 +1100
committerAlex Gorrod <alexg@wiredtiger.com>2014-03-19 17:12:16 +1100
commit1c519e2bd1856486de18a15add8c866e222501c5 (patch)
tree590d6c60cfca4670be5ef2929170a987795c9309 /bench
parent6f87921ffd392093cf1a249f687650a0fd58437b (diff)
downloadmongo-1c519e2bd1856486de18a15add8c866e222501c5.tar.gz
Fix wtperf warmup phase to execute mixes workloads.
Diffstat (limited to 'bench')
-rw-r--r--bench/wtperf/runners/multi-btree.wtperf4
-rw-r--r--bench/wtperf/wtperf.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/bench/wtperf/runners/multi-btree.wtperf b/bench/wtperf/runners/multi-btree.wtperf
index 42cd12d8de8..e316dda9e88 100644
--- a/bench/wtperf/runners/multi-btree.wtperf
+++ b/bench/wtperf/runners/multi-btree.wtperf
@@ -11,7 +11,7 @@ random_range=100000000
checkpoint_interval=20
checkpoint_threads=1
report_interval=5
-run_time=200
+run_time=20
threads=((count=2,reads=1),(count=2,inserts=1))
value_sz=100
-warmup=150
+warmup=10
diff --git a/bench/wtperf/wtperf.c b/bench/wtperf/wtperf.c
index e9cc4b36cdc..d355f9ffeeb 100644
--- a/bench/wtperf/wtperf.c
+++ b/bench/wtperf/wtperf.c
@@ -389,11 +389,11 @@ op_err: lprintf(cfg, ret, 0,
}
/* Increment operation count */
++trk->ops;
-
- /* Schedule the next operation */
- if (++op == op_end)
- op = thread->workload->ops;
}
+
+ /* Schedule the next operation */
+ if (++op == op_end)
+ op = thread->workload->ops;
}
if ((ret = session->close(session, NULL)) != 0) {