From c94ddad46525fbf34f561b0cc6c3e33cc6273c0d Mon Sep 17 00:00:00 2001 From: "Pavel.Paulau" Date: Thu, 22 Nov 2012 17:56:23 +0300 Subject: [PATCH] CBD-667 CBD-538: get rid of obsolete vperf tests It allows to break backward compatibility Change-Id: Ia361d17c996cd5d3cc8980e65431b242626951cb Reviewed-on: http://review.couchbase.org/22769 Reviewed-by: Pavel Paulau Tested-by: Pavel Paulau --- conf/perf/obsolete/evperf-workload2-1.conf | 36 --- .../evperf-workload2-1_more_fg_stats.conf | 37 --- conf/perf/obsolete/evperf-workload2-2.conf | 36 --- .../obsolete/evperf-workload2-2_bg-0.conf | 37 --- .../evperf-workload2-2_more_fg_stats.conf | 37 --- .../obsolete/evperf-workload2-2_stale-ok.conf | 39 --- conf/perf/obsolete/evperf-workload2-3.5.conf | 36 --- conf/perf/obsolete/evperf-workload2-3.conf | 36 --- .../evperf-workload2-3_extreme_fg_stats.conf | 39 --- .../evperf-workload2-3_more_fg_stats.conf | 37 --- .../evperf-workload2-3_replicas-0.conf | 39 --- .../obsolete/evperf-workload2-3_stale-ok.conf | 39 --- conf/perf/obsolete/evperf-workload2-4.conf | 36 --- .../evperf-workload2-4_extreme_fg_stats.conf | 39 --- .../evperf-workload2-4_more_fg_stats.conf | 37 --- conf/perf/obsolete/evperf-workload2-5.conf | 36 --- .../perf/obsolete/evperf-workload2-heavy.conf | 40 --- conf/perf/obsolete/evperf-workload3-1.conf | 39 --- conf/perf/obsolete/evperf-workload3-2.conf | 39 --- conf/perf/obsolete/evperf-workload3-3.conf | 39 --- conf/perf/obsolete/evperf-workload3-4.conf | 39 --- conf/perf/obsolete/evperf-workload3-5.conf | 39 --- conf/perf/obsolete/lucky8-1.conf | 39 --- conf/perf/obsolete/lucky8-2.conf | 39 --- conf/perf/obsolete/lucky8-3.conf | 39 --- conf/perf/obsolete/lucky8-4-1-fg200.conf | 41 --- conf/perf/obsolete/lucky8-4-1.conf | 41 --- conf/perf/obsolete/lucky8-4-3-fg200.conf | 41 --- conf/perf/obsolete/lucky8-5-1-fg200.conf | 40 --- conf/perf/obsolete/lucky8-5-1.conf | 40 --- conf/perf/obsolete/lucky8-5-2.conf | 40 --- conf/perf/obsolete/vperf1-1.conf | 36 --- conf/perf/obsolete/vperf1-2.conf | 36 --- conf/perf/obsolete/vperf1-3.conf | 36 --- conf/perf/obsolete/vperf1-4.conf | 36 --- conf/perf/obsolete/vperf1-5.conf | 36 --- conf/perf/obsolete/vperf3-1.conf | 38 --- conf/perf/obsolete/vperf3-2.conf | 38 --- conf/perf/obsolete/vperf3-3.conf | 38 --- conf/perf/obsolete/vperf3-4.conf | 38 --- pytests/performance/eperf.py | 300 +----------------- pytests/performance/viewgen.py | 21 -- 42 files changed, 4 insertions(+), 1840 deletions(-) delete mode 100644 conf/perf/obsolete/evperf-workload2-1.conf delete mode 100644 conf/perf/obsolete/evperf-workload2-1_more_fg_stats.conf delete mode 100644 conf/perf/obsolete/evperf-workload2-2.conf delete mode 100644 conf/perf/obsolete/evperf-workload2-2_bg-0.conf delete mode 100644 conf/perf/obsolete/evperf-workload2-2_more_fg_stats.conf delete mode 100644 conf/perf/obsolete/evperf-workload2-2_stale-ok.conf delete mode 100644 conf/perf/obsolete/evperf-workload2-3.5.conf delete mode 100644 conf/perf/obsolete/evperf-workload2-3.conf delete mode 100644 conf/perf/obsolete/evperf-workload2-3_extreme_fg_stats.conf delete mode 100644 conf/perf/obsolete/evperf-workload2-3_more_fg_stats.conf delete mode 100644 conf/perf/obsolete/evperf-workload2-3_replicas-0.conf delete mode 100644 conf/perf/obsolete/evperf-workload2-3_stale-ok.conf delete mode 100644 conf/perf/obsolete/evperf-workload2-4.conf delete mode 100644 conf/perf/obsolete/evperf-workload2-4_extreme_fg_stats.conf delete mode 100644 conf/perf/obsolete/evperf-workload2-4_more_fg_stats.conf delete mode 100644 conf/perf/obsolete/evperf-workload2-5.conf delete mode 100644 conf/perf/obsolete/evperf-workload2-heavy.conf delete mode 100644 conf/perf/obsolete/evperf-workload3-1.conf delete mode 100644 conf/perf/obsolete/evperf-workload3-2.conf delete mode 100644 conf/perf/obsolete/evperf-workload3-3.conf delete mode 100644 conf/perf/obsolete/evperf-workload3-4.conf delete mode 100644 conf/perf/obsolete/evperf-workload3-5.conf delete mode 100644 conf/perf/obsolete/lucky8-1.conf delete mode 100644 conf/perf/obsolete/lucky8-2.conf delete mode 100644 conf/perf/obsolete/lucky8-3.conf delete mode 100644 conf/perf/obsolete/lucky8-4-1-fg200.conf delete mode 100644 conf/perf/obsolete/lucky8-4-1.conf delete mode 100644 conf/perf/obsolete/lucky8-4-3-fg200.conf delete mode 100644 conf/perf/obsolete/lucky8-5-1-fg200.conf delete mode 100644 conf/perf/obsolete/lucky8-5-1.conf delete mode 100644 conf/perf/obsolete/lucky8-5-2.conf delete mode 100644 conf/perf/obsolete/vperf1-1.conf delete mode 100644 conf/perf/obsolete/vperf1-2.conf delete mode 100644 conf/perf/obsolete/vperf1-3.conf delete mode 100644 conf/perf/obsolete/vperf1-4.conf delete mode 100644 conf/perf/obsolete/vperf1-5.conf delete mode 100644 conf/perf/obsolete/vperf3-1.conf delete mode 100644 conf/perf/obsolete/vperf3-2.conf delete mode 100644 conf/perf/obsolete/vperf3-3.conf delete mode 100644 conf/perf/obsolete/vperf3-4.conf diff --git a/conf/perf/obsolete/evperf-workload2-1.conf b/conf/perf/obsolete/evperf-workload2-1.conf deleted file mode 100644 index b5140c4e6c..0000000000 --- a/conf/perf/obsolete/evperf-workload2-1.conf +++ /dev/null @@ -1,36 +0,0 @@ -# 1M load, 7G mem_quota, small-scale 2K max ops, for dev/sanity check - -performance.eperf.EVPerfClient.test_evperf_workload2 - -params: - -# general -batch=50 -kind=json -mem_quota=7000 -spec=evperf-workload2-1 - -# load phase -items=1000000 - -# access phase -ratio_sets=0.3 -ratio_misses=0.05 -ratio_creates=0.33 -ratio_deletes=0.25 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.03 -bg_max_ops_per_sec=10 -fg_max_ops=2000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 \ No newline at end of file diff --git a/conf/perf/obsolete/evperf-workload2-1_more_fg_stats.conf b/conf/perf/obsolete/evperf-workload2-1_more_fg_stats.conf deleted file mode 100644 index 4afbc08937..0000000000 --- a/conf/perf/obsolete/evperf-workload2-1_more_fg_stats.conf +++ /dev/null @@ -1,37 +0,0 @@ -# 1M load, 7G mem_quota, small-scale 2K max ops, for dev/sanity check - -performance.eperf.EVPerfClient.test_evperf_workload2 - -params: - -# general -batch=50 -kind=json -mem_quota=7000 -spec=evperf-workload2-1_more_fg_stats - -# load phase -items=1000000 - -# access phase -ratio_sets=0.3 -ratio_misses=0.05 -ratio_creates=0.33 -ratio_deletes=0.25 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.03 -bg_max_ops_per_sec=10 -fg_max_ops=2000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -mcsoda_fg_stats_ops=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 diff --git a/conf/perf/obsolete/evperf-workload2-2.conf b/conf/perf/obsolete/evperf-workload2-2.conf deleted file mode 100644 index 248374b008..0000000000 --- a/conf/perf/obsolete/evperf-workload2-2.conf +++ /dev/null @@ -1,36 +0,0 @@ -# 1M load, 7G mem_quota, small-scale 10K max ops, for dev/sanity check - -performance.eperf.EVPerfClient.test_evperf_workload2 - -params: - -# general -batch=50 -kind=json -mem_quota=7000 -spec=evperf-workload2-2 - -# load phase -items=1000000 - -# access phase -ratio_sets=0.3 -ratio_misses=0.05 -ratio_creates=0.33 -ratio_deletes=0.25 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.03 -bg_max_ops_per_sec=10 -fg_max_ops=10000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 \ No newline at end of file diff --git a/conf/perf/obsolete/evperf-workload2-2_bg-0.conf b/conf/perf/obsolete/evperf-workload2-2_bg-0.conf deleted file mode 100644 index d61cc867a3..0000000000 --- a/conf/perf/obsolete/evperf-workload2-2_bg-0.conf +++ /dev/null @@ -1,37 +0,0 @@ -# 1M load, 7G mem_quota, small-scale 10K max ops, for dev/sanity check, bg ops 0 - -performance.eperf.EVPerfClient.test_evperf_workload2 - -params: - -# general -batch=50 -kind=json -mem_quota=7000 -spec=evperf-workload2-2 - -# load phase -items=1000000 - -# access phase -ratio_sets=0.0 -ratio_misses=0.0 -ratio_creates=0.33 -ratio_deletes=0.25 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.03 -ratio_queries=1.0 -bg_max_ops_per_sec=0 -fg_max_ops=10000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 \ No newline at end of file diff --git a/conf/perf/obsolete/evperf-workload2-2_more_fg_stats.conf b/conf/perf/obsolete/evperf-workload2-2_more_fg_stats.conf deleted file mode 100644 index 6c4abf6905..0000000000 --- a/conf/perf/obsolete/evperf-workload2-2_more_fg_stats.conf +++ /dev/null @@ -1,37 +0,0 @@ -# 1M load, 7G mem_quota, small-scale 10K max ops, for dev/sanity check - -performance.eperf.EVPerfClient.test_evperf_workload2 - -params: - -# general -batch=50 -kind=json -mem_quota=7000 -spec=evperf-workload2-2_more_fg_stats - -# load phase -items=1000000 - -# access phase -ratio_sets=0.3 -ratio_misses=0.05 -ratio_creates=0.33 -ratio_deletes=0.25 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.03 -bg_max_ops_per_sec=10 -fg_max_ops=10000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -mcsoda_fg_stats_ops=0 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 diff --git a/conf/perf/obsolete/evperf-workload2-2_stale-ok.conf b/conf/perf/obsolete/evperf-workload2-2_stale-ok.conf deleted file mode 100644 index 0c6f6046e4..0000000000 --- a/conf/perf/obsolete/evperf-workload2-2_stale-ok.conf +++ /dev/null @@ -1,39 +0,0 @@ -# 1M load, 7G mem_quota, small-scale 10K max ops, for dev/sanity check, stale=ok - -performance.eperf.EVPerfClient.test_evperf_workload2 - -params: - -# general -batch=50 -kind=json -mem_quota=7000 -spec=evperf-workload2-2_stale-ok - -# load phase -items=1000000 - -# access phase -ratio_sets=0.3 -ratio_misses=0.05 -ratio_creates=0.33 -ratio_deletes=0.25 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.03 -bg_max_ops_per_sec=10 -fg_max_ops=10000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 - -# extra -query_suffix=&stale=ok diff --git a/conf/perf/obsolete/evperf-workload2-3.5.conf b/conf/perf/obsolete/evperf-workload2-3.5.conf deleted file mode 100644 index 27fcef3d36..0000000000 --- a/conf/perf/obsolete/evperf-workload2-3.5.conf +++ /dev/null @@ -1,36 +0,0 @@ -# 1M load, 7G mem_quota, 50K max ops, with 1K bg ops/sec - -performance.eperf.EVPerfClient.test_evperf_workload2 - -params: - -# general -batch=50 -kind=json -mem_quota=7000 -spec=evperf-workload2-3.5 - -# load phase -items=1000000 - -# access phase -ratio_sets=0.3 -ratio_misses=0.05 -ratio_creates=0.33 -ratio_deletes=0.25 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.03 -bg_max_ops_per_sec=1000 -fg_max_ops=50000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 diff --git a/conf/perf/obsolete/evperf-workload2-3.conf b/conf/perf/obsolete/evperf-workload2-3.conf deleted file mode 100644 index 8984584634..0000000000 --- a/conf/perf/obsolete/evperf-workload2-3.conf +++ /dev/null @@ -1,36 +0,0 @@ -# 1M load, 7G mem_quota, small-scale 10K max ops, with 1K bg ops/sec - -performance.eperf.EVPerfClient.test_evperf_workload2 - -params: - -# general -batch=50 -kind=json -mem_quota=7000 -spec=evperf-workload2-3 - -# load phase -items=1000000 - -# access phase -ratio_sets=0.3 -ratio_misses=0.05 -ratio_creates=0.33 -ratio_deletes=0.25 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.03 -bg_max_ops_per_sec=1000 -fg_max_ops=10000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 diff --git a/conf/perf/obsolete/evperf-workload2-3_extreme_fg_stats.conf b/conf/perf/obsolete/evperf-workload2-3_extreme_fg_stats.conf deleted file mode 100644 index e8c6df756e..0000000000 --- a/conf/perf/obsolete/evperf-workload2-3_extreme_fg_stats.conf +++ /dev/null @@ -1,39 +0,0 @@ -# 1M load, 7G mem_quota, small-scale 10K max ops, with 1K bg ops/sec -# In order to produce more query latency samples, \ -# reduce batch size to 1, fg stats ops to 0(no limit). - -performance.eperf.EVPerfClient.test_evperf_workload2 - -params: - -# general -batch=1 -kind=json -mem_quota=7000 -spec=evperf-workload2-3_extreme_fg_stats - -# load phase -items=1000000 - -# access phase -ratio_sets=0.3 -ratio_misses=0.05 -ratio_creates=0.33 -ratio_deletes=0.25 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.03 -bg_max_ops_per_sec=1000 -fg_max_ops=10000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -mcsoda_fg_stats_ops=0 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 diff --git a/conf/perf/obsolete/evperf-workload2-3_more_fg_stats.conf b/conf/perf/obsolete/evperf-workload2-3_more_fg_stats.conf deleted file mode 100644 index 1b46134b72..0000000000 --- a/conf/perf/obsolete/evperf-workload2-3_more_fg_stats.conf +++ /dev/null @@ -1,37 +0,0 @@ -# 1M load, 7G mem_quota, small-scale 10K max ops, with 1K bg ops/sec - -performance.eperf.EVPerfClient.test_evperf_workload2 - -params: - -# general -batch=50 -kind=json -mem_quota=7000 -spec=evperf-workload2-3_more_fg_stats - -# load phase -items=1000000 - -# access phase -ratio_sets=0.3 -ratio_misses=0.05 -ratio_creates=0.33 -ratio_deletes=0.25 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.03 -bg_max_ops_per_sec=1000 -fg_max_ops=10000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -mcsoda_fg_stats_ops=50 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 diff --git a/conf/perf/obsolete/evperf-workload2-3_replicas-0.conf b/conf/perf/obsolete/evperf-workload2-3_replicas-0.conf deleted file mode 100644 index 7ae22d9cf0..0000000000 --- a/conf/perf/obsolete/evperf-workload2-3_replicas-0.conf +++ /dev/null @@ -1,39 +0,0 @@ -# 1M load, 7G mem_quota, small-scale 10K max ops, with 1K bg ops/sec, replicas=0 - -performance.eperf.EVPerfClient.test_evperf_workload2 - -params: - -# general -batch=50 -kind=json -mem_quota=7000 -spec=evperf-workload2-3_replicas-0 - -# load phase -items=1000000 - -# access phase -ratio_sets=0.3 -ratio_misses=0.05 -ratio_creates=0.33 -ratio_deletes=0.25 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.03 -bg_max_ops_per_sec=1000 -fg_max_ops=10000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 - -#extra -replicas=0 diff --git a/conf/perf/obsolete/evperf-workload2-3_stale-ok.conf b/conf/perf/obsolete/evperf-workload2-3_stale-ok.conf deleted file mode 100644 index 05215da305..0000000000 --- a/conf/perf/obsolete/evperf-workload2-3_stale-ok.conf +++ /dev/null @@ -1,39 +0,0 @@ -# 1M load, 7G mem_quota, small-scale 10K max ops, with 1K bg ops/sec, stale=ok - -performance.eperf.EVPerfClient.test_evperf_workload2 - -params: - -# general -batch=50 -kind=json -mem_quota=7000 -spec=evperf-workload2-3_stale-ok - -# load phase -items=1000000 - -# access phase -ratio_sets=0.3 -ratio_misses=0.05 -ratio_creates=0.33 -ratio_deletes=0.25 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.03 -bg_max_ops_per_sec=1000 -fg_max_ops=10000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 - -# extra -query_suffix=&stale=ok diff --git a/conf/perf/obsolete/evperf-workload2-4.conf b/conf/perf/obsolete/evperf-workload2-4.conf deleted file mode 100644 index dcde445374..0000000000 --- a/conf/perf/obsolete/evperf-workload2-4.conf +++ /dev/null @@ -1,36 +0,0 @@ -# 4M load, 7G mem_quota, 50K max ops, with 1K bg ops/sec - -performance.eperf.EVPerfClient.test_evperf_workload2 - -params: - -# general -batch=50 -kind=json -mem_quota=7000 -spec=evperf-workload2-4 - -# load phase -items=4000000 - -# access phase -ratio_sets=0.3 -ratio_misses=0.05 -ratio_creates=0.33 -ratio_deletes=0.25 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.03 -bg_max_ops_per_sec=1000 -fg_max_ops=50000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 diff --git a/conf/perf/obsolete/evperf-workload2-4_extreme_fg_stats.conf b/conf/perf/obsolete/evperf-workload2-4_extreme_fg_stats.conf deleted file mode 100644 index 884fc08de7..0000000000 --- a/conf/perf/obsolete/evperf-workload2-4_extreme_fg_stats.conf +++ /dev/null @@ -1,39 +0,0 @@ -# 4M load, 7G mem_quota, 50K max ops, with 1K bg ops/sec -# In order to produce more query latency samples, \ -# reduce batch size to 1, fg stats ops to 0(no limit). - -performance.eperf.EVPerfClient.test_evperf_workload2 - -params: - -# general -batch=1 -kind=json -mem_quota=7000 -spec=evperf-workload2-4_extreme_fg_stats - -# load phase -items=4000000 - -# access phase -ratio_sets=0.3 -ratio_misses=0.05 -ratio_creates=0.33 -ratio_deletes=0.25 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.03 -bg_max_ops_per_sec=1000 -fg_max_ops=50000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -mcsoda_fg_stats_ops=0 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 diff --git a/conf/perf/obsolete/evperf-workload2-4_more_fg_stats.conf b/conf/perf/obsolete/evperf-workload2-4_more_fg_stats.conf deleted file mode 100644 index da1faed8c4..0000000000 --- a/conf/perf/obsolete/evperf-workload2-4_more_fg_stats.conf +++ /dev/null @@ -1,37 +0,0 @@ -# 4M load, 7G mem_quota, 50K max ops, with 1K bg ops/sec - -performance.eperf.EVPerfClient.test_evperf_workload2 - -params: - -# general -batch=50 -kind=json -mem_quota=7000 -spec=evperf-workload2-4_more_fg_stats - -# load phase -items=4000000 - -# access phase -ratio_sets=0.3 -ratio_misses=0.05 -ratio_creates=0.33 -ratio_deletes=0.25 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.03 -bg_max_ops_per_sec=1000 -fg_max_ops=50000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -mcsoda_fg_stats_ops=50 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 diff --git a/conf/perf/obsolete/evperf-workload2-5.conf b/conf/perf/obsolete/evperf-workload2-5.conf deleted file mode 100644 index a4610bd546..0000000000 --- a/conf/perf/obsolete/evperf-workload2-5.conf +++ /dev/null @@ -1,36 +0,0 @@ -# 8M load, 7G mem_quota, 100K max ops, with 1K bg ops/sec - -performance.eperf.EVPerfClient.test_evperf_workload2 - -params: - -# general -batch=50 -kind=json -mem_quota=7000 -spec=evperf-workload2-5 - -# load phase -items=8000000 - -# access phase -ratio_sets=0.3 -ratio_misses=0.05 -ratio_creates=0.33 -ratio_deletes=0.25 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.03 -bg_max_ops_per_sec=1000 -fg_max_ops=100000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 diff --git a/conf/perf/obsolete/evperf-workload2-heavy.conf b/conf/perf/obsolete/evperf-workload2-heavy.conf deleted file mode 100644 index 95118a32e0..0000000000 --- a/conf/perf/obsolete/evperf-workload2-heavy.conf +++ /dev/null @@ -1,40 +0,0 @@ -# heavy view performance test (for Farshid): -# 15K ops/sec (background, cluster-wide) -# 200K ops (foreground/queries) -# 40% reads, 60% write (54% updates, 3% deletes, 3% inserts) -# 10M dataset -# _all_docs queries - -performance.eperf.EVPerfClient.test_evperf_workload2 - -params: - -# general -batch=50 -kind=json -mem_quota=20000 - -# load phase -items=10000000 - -# access phase -ratio_sets=0.6 -ratio_misses=0.05 -ratio_creates=0.05 -ratio_deletes=0.05 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.0 -bg_max_ops_per_sec=5000 -fg_max_ops=20000000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 diff --git a/conf/perf/obsolete/evperf-workload3-1.conf b/conf/perf/obsolete/evperf-workload3-1.conf deleted file mode 100644 index 06ca169d1b..0000000000 --- a/conf/perf/obsolete/evperf-workload3-1.conf +++ /dev/null @@ -1,39 +0,0 @@ -# EVPerf Worload 3: queiries on primary index, on secondary indicies -# and secondary index with reduce step. -# bg_ops_per_sec: 10 -# fg_ops: 2000 - -performance.eperf.EVPerfClient.test_evperf_workload3 - -params: - -# general -batch=50 -kind=json -mem_quota=7000 -spec=evperf-workload3-1 - -# load phase -items=1000000 - -# access phase -ratio_sets=0.3 -ratio_misses=0.05 -ratio_creates=0.33 -ratio_deletes=0.25 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.03 -bg_max_ops_per_sec=10 -fg_max_ops=2000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 diff --git a/conf/perf/obsolete/evperf-workload3-2.conf b/conf/perf/obsolete/evperf-workload3-2.conf deleted file mode 100644 index 88f08ef499..0000000000 --- a/conf/perf/obsolete/evperf-workload3-2.conf +++ /dev/null @@ -1,39 +0,0 @@ -# EVPerf Worload 3: queiries on primary index, on secondary indicies -# and secondary index with reduce step. -# bg_ops_per_sec: 10 -# fg_ops: 10000 - -performance.eperf.EVPerfClient.test_evperf_workload3 - -params: - -# general -batch=50 -kind=json -mem_quota=7000 -spec=evperf-workload3-2 - -# load phase -items=1000000 - -# access phase -ratio_sets=0.3 -ratio_misses=0.05 -ratio_creates=0.33 -ratio_deletes=0.25 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.03 -bg_max_ops_per_sec=10 -fg_max_ops=10000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 diff --git a/conf/perf/obsolete/evperf-workload3-3.conf b/conf/perf/obsolete/evperf-workload3-3.conf deleted file mode 100644 index 8b08ddd1aa..0000000000 --- a/conf/perf/obsolete/evperf-workload3-3.conf +++ /dev/null @@ -1,39 +0,0 @@ -# EVPerf Worload 3: queiries on primary index, on secondary indicies -# and secondary index with reduce step. -# bg_ops_per_sec: 1000 -# fg_ops: 10000 - -performance.eperf.EVPerfClient.test_evperf_workload3 - -params: - -# general -batch=50 -kind=json -mem_quota=7000 -spec=evperf-workload3-3 - -# load phase -items=1000000 - -# access phase -ratio_sets=0.3 -ratio_misses=0.05 -ratio_creates=0.33 -ratio_deletes=0.25 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.03 -bg_max_ops_per_sec=1000 -fg_max_ops=10000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 diff --git a/conf/perf/obsolete/evperf-workload3-4.conf b/conf/perf/obsolete/evperf-workload3-4.conf deleted file mode 100644 index 9685525e86..0000000000 --- a/conf/perf/obsolete/evperf-workload3-4.conf +++ /dev/null @@ -1,39 +0,0 @@ -# EVPerf Worload 3: queiries on primary index, on secondary indicies -# and secondary index with reduce step. -# bg_ops_per_sec: 1000 -# fg_ops: 50000 - -performance.eperf.EVPerfClient.test_evperf_workload3 - -params: - -# general -batch=50 -kind=json -mem_quota=7000 -spec=evperf-workload3-4 - -# load phase -items=1000000 - -# access phase -ratio_sets=0.3 -ratio_misses=0.05 -ratio_creates=0.33 -ratio_deletes=0.25 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.03 -bg_max_ops_per_sec=1000 -fg_max_ops=50000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 diff --git a/conf/perf/obsolete/evperf-workload3-5.conf b/conf/perf/obsolete/evperf-workload3-5.conf deleted file mode 100644 index 2d24c0943e..0000000000 --- a/conf/perf/obsolete/evperf-workload3-5.conf +++ /dev/null @@ -1,39 +0,0 @@ -# EVPerf Worload 3: queiries on primary index, on secondary indicies -# and secondary index with reduce step. -# bg_ops_per_sec: 1000 -# fg_ops: 100000 - -performance.eperf.EVPerfClient.test_evperf_workload3 - -params: - -# general -batch=50 -kind=json -mem_quota=7000 -spec=evperf-workload3-5 - -# load phase -items=1000000 - -# access phase -ratio_sets=0.3 -ratio_misses=0.05 -ratio_creates=0.33 -ratio_deletes=0.25 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.03 -bg_max_ops_per_sec=1000 -fg_max_ops=100000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 diff --git a/conf/perf/obsolete/lucky8-1.conf b/conf/perf/obsolete/lucky8-1.conf deleted file mode 100644 index 5b1350ae06..0000000000 --- a/conf/perf/obsolete/lucky8-1.conf +++ /dev/null @@ -1,39 +0,0 @@ -# "lucky 8" view performance test: -# 8K ops/sec (background, cluster-wide) -# 200K ops (foreground/queries) -# 80% reads, 20% write (12% updates/deletes, 8% inserts) -# 4M dataset - -performance.eperf.EVPerfClient.test_evperf_workload2 - -params: - -# general -batch=50 -kind=json -mem_quota=16000 - -# load phase -items=4000000 - -# access phase -ratio_sets=0.2 -ratio_misses=0.05 -ratio_creates=0.40 -ratio_deletes=0.50 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.0 -bg_max_ops_per_sec=2666 -fg_max_ops=200000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 diff --git a/conf/perf/obsolete/lucky8-2.conf b/conf/perf/obsolete/lucky8-2.conf deleted file mode 100644 index 087c62e75c..0000000000 --- a/conf/perf/obsolete/lucky8-2.conf +++ /dev/null @@ -1,39 +0,0 @@ -# "lucky 8" view performance test: -# 8K ops/sec (background, cluster-wide) -# 10K ops (foreground/queries) -# 80% reads, 20% write (12% updates/deletes, 8% inserts) -# 1M dataset - -performance.eperf.EVPerfClient.test_evperf_workload2 - -params: - -# general -batch=50 -kind=json -mem_quota=7000 - -# load phase -items=1000000 - -# access phase -ratio_sets=0.2 -ratio_misses=0.05 -ratio_creates=0.40 -ratio_deletes=0.50 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.0 -bg_max_ops_per_sec=2666 -fg_max_ops=10000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 diff --git a/conf/perf/obsolete/lucky8-3.conf b/conf/perf/obsolete/lucky8-3.conf deleted file mode 100644 index 448f43388e..0000000000 --- a/conf/perf/obsolete/lucky8-3.conf +++ /dev/null @@ -1,39 +0,0 @@ -# "lucky 8" view performance test: -# 8K ops/sec (background, cluster-wide) -# 80K ops (foreground/queries) -# 80% reads, 20% write (12% updates/deletes, 8% inserts) -# 2M dataset - -performance.eperf.EVPerfClient.test_evperf_workload2 - -params: - -# general -batch=50 -kind=json -mem_quota=16000 - -# load phase -items=2000000 - -# access phase -ratio_sets=0.2 -ratio_misses=0.05 -ratio_creates=0.40 -ratio_deletes=0.50 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.0 -bg_max_ops_per_sec=2666 -fg_max_ops=80000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 diff --git a/conf/perf/obsolete/lucky8-4-1-fg200.conf b/conf/perf/obsolete/lucky8-4-1-fg200.conf deleted file mode 100644 index 54ff959874..0000000000 --- a/conf/perf/obsolete/lucky8-4-1-fg200.conf +++ /dev/null @@ -1,41 +0,0 @@ -# "lucky 8" view performance test: -# 8K ops/sec (background, cluster-wide) -# 200K ops (foreground/queries) -# 80% reads, 20% write (12% updates/deletes, 8% inserts) -# 2M dataset -# no queries on primary index -# 8 ddocs with 1 view - -performance.eperf.EVPerfClient.test_vperf3 - -params: - -# general -batch=50 -kind=json -mem_quota=16000 - -# load phase -items=2000000 - -# access phase -ratio_sets=0.2 -ratio_misses=0.05 -ratio_creates=0.40 -ratio_deletes=0.50 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.0 -bg_max_ops_per_sec=2666 -fg_max_ops=200000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 diff --git a/conf/perf/obsolete/lucky8-4-1.conf b/conf/perf/obsolete/lucky8-4-1.conf deleted file mode 100644 index 8051ec9473..0000000000 --- a/conf/perf/obsolete/lucky8-4-1.conf +++ /dev/null @@ -1,41 +0,0 @@ -# "lucky 8" view performance test: -# 8K ops/sec (background, cluster-wide) -# 80K ops (foreground/queries) -# 80% reads, 20% write (12% updates/deletes, 8% inserts) -# 2M dataset -# no queries on primary index -# 8 ddocs with 1 view - -performance.eperf.EVPerfClient.test_vperf3 - -params: - -# general -batch=50 -kind=json -mem_quota=16000 - -# load phase -items=2000000 - -# access phase -ratio_sets=0.2 -ratio_misses=0.05 -ratio_creates=0.40 -ratio_deletes=0.50 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.0 -bg_max_ops_per_sec=2666 -fg_max_ops=80000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 diff --git a/conf/perf/obsolete/lucky8-4-3-fg200.conf b/conf/perf/obsolete/lucky8-4-3-fg200.conf deleted file mode 100644 index 5d287d42d4..0000000000 --- a/conf/perf/obsolete/lucky8-4-3-fg200.conf +++ /dev/null @@ -1,41 +0,0 @@ -# "lucky 8" view performance test: -# 8K ops/sec (background, cluster-wide) -# 200K ops (foreground/queries) -# 80% reads, 20% write (12% updates/deletes, 8% inserts) -# 2M dataset -# no queries on primary index -# 1 ddoc with 1 view - -performance.eperf.EVPerfClient.test_vperf1 - -params: - -# general -batch=50 -kind=json -mem_quota=16000 - -# load phase -items=2000000 - -# access phase -ratio_sets=0.2 -ratio_misses=0.05 -ratio_creates=0.40 -ratio_deletes=0.50 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.0 -bg_max_ops_per_sec=2666 -fg_max_ops=200000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 diff --git a/conf/perf/obsolete/lucky8-5-1-fg200.conf b/conf/perf/obsolete/lucky8-5-1-fg200.conf deleted file mode 100644 index 260ea1325a..0000000000 --- a/conf/perf/obsolete/lucky8-5-1-fg200.conf +++ /dev/null @@ -1,40 +0,0 @@ -# "lucky 8" view performance test: -# 8K ops/sec (background, cluster-wide) -# 200K ops (foreground/queries) -# 80% reads, 20% write (12% updates/deletes, 8% inserts) -# 2M dataset -# only queries on primary index - -performance.eperf.EVPerfClient.test_vperf5 - -params: - -# general -batch=50 -kind=json -mem_quota=16000 - -# load phase -items=2000000 - -# access phase -ratio_sets=0.2 -ratio_misses=0.05 -ratio_creates=0.40 -ratio_deletes=0.50 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.0 -bg_max_ops_per_sec=2666 -fg_max_ops=200000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 diff --git a/conf/perf/obsolete/lucky8-5-1.conf b/conf/perf/obsolete/lucky8-5-1.conf deleted file mode 100644 index 360ea9f04e..0000000000 --- a/conf/perf/obsolete/lucky8-5-1.conf +++ /dev/null @@ -1,40 +0,0 @@ -# "lucky 8" view performance test: -# 8K ops/sec (background, cluster-wide) -# 80K ops (foreground/queries) -# 80% reads, 20% write (12% updates/deletes, 8% inserts) -# 2M dataset -# only queries on primary index - -performance.eperf.EVPerfClient.test_vperf5 - -params: - -# general -batch=50 -kind=json -mem_quota=16000 - -# load phase -items=2000000 - -# access phase -ratio_sets=0.2 -ratio_misses=0.05 -ratio_creates=0.40 -ratio_deletes=0.50 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.0 -bg_max_ops_per_sec=2666 -fg_max_ops=80000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 diff --git a/conf/perf/obsolete/lucky8-5-2.conf b/conf/perf/obsolete/lucky8-5-2.conf deleted file mode 100644 index a45013284c..0000000000 --- a/conf/perf/obsolete/lucky8-5-2.conf +++ /dev/null @@ -1,40 +0,0 @@ -# "lucky 8" view performance test: -# 8K ops/sec (background, cluster-wide) -# 80K ops (foreground/queries) -# 80% reads, 20% write (12% updates/deletes, 8% inserts) -# 2M dataset -# only queries on pseudo primary index - -performance.eperf.EVPerfClient.test_vperf6 - -params: - -# general -batch=50 -kind=json -mem_quota=16000 - -# load phase -items=2000000 - -# access phase -ratio_sets=0.2 -ratio_misses=0.05 -ratio_creates=0.40 -ratio_deletes=0.50 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.0 -bg_max_ops_per_sec=2666 -fg_max_ops=80000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 diff --git a/conf/perf/obsolete/vperf1-1.conf b/conf/perf/obsolete/vperf1-1.conf deleted file mode 100644 index 422d521877..0000000000 --- a/conf/perf/obsolete/vperf1-1.conf +++ /dev/null @@ -1,36 +0,0 @@ -# Like evperf-workload2-1, but single ddoc view - -performance.eperf.EVPerfClient.test_vperf1 - -params: - -# general -batch=50 -kind=json -mem_quota=7000 -spec=vperf1-1 - -# load phase -items=1000000 - -# access phase -ratio_sets=0.3 -ratio_misses=0.05 -ratio_creates=0.33 -ratio_deletes=0.25 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.03 -bg_max_ops_per_sec=10 -fg_max_ops=2000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 \ No newline at end of file diff --git a/conf/perf/obsolete/vperf1-2.conf b/conf/perf/obsolete/vperf1-2.conf deleted file mode 100644 index bf25af64c1..0000000000 --- a/conf/perf/obsolete/vperf1-2.conf +++ /dev/null @@ -1,36 +0,0 @@ -# Like evperf-workload2-2, but single ddoc view - -performance.eperf.EVPerfClient.test_vperf1 - -params: - -# general -batch=50 -kind=json -mem_quota=7000 -spec=vperf1-2 - -# load phase -items=1000000 - -# access phase -ratio_sets=0.3 -ratio_misses=0.05 -ratio_creates=0.33 -ratio_deletes=0.25 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.03 -bg_max_ops_per_sec=10 -fg_max_ops=10000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 \ No newline at end of file diff --git a/conf/perf/obsolete/vperf1-3.conf b/conf/perf/obsolete/vperf1-3.conf deleted file mode 100644 index e68780ad58..0000000000 --- a/conf/perf/obsolete/vperf1-3.conf +++ /dev/null @@ -1,36 +0,0 @@ -# Like evperf-workload2-3, but single ddoc view - -performance.eperf.EVPerfClient.test_vperf1 - -params: - -# general -batch=50 -kind=json -mem_quota=7000 -spec=vperf1-3 - -# load phase -items=1000000 - -# access phase -ratio_sets=0.3 -ratio_misses=0.05 -ratio_creates=0.33 -ratio_deletes=0.25 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.03 -bg_max_ops_per_sec=1000 -fg_max_ops=10000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 diff --git a/conf/perf/obsolete/vperf1-4.conf b/conf/perf/obsolete/vperf1-4.conf deleted file mode 100644 index f8ee9a4306..0000000000 --- a/conf/perf/obsolete/vperf1-4.conf +++ /dev/null @@ -1,36 +0,0 @@ -# Like evperf-workload2-4, but single ddoc view - -performance.eperf.EVPerfClient.test_vperf1 - -params: - -# general -batch=50 -kind=json -mem_quota=7000 -spec=vperf1-4 - -# load phase -items=4000000 - -# access phase -ratio_sets=0.3 -ratio_misses=0.05 -ratio_creates=0.33 -ratio_deletes=0.25 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.03 -bg_max_ops_per_sec=1000 -fg_max_ops=50000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 diff --git a/conf/perf/obsolete/vperf1-5.conf b/conf/perf/obsolete/vperf1-5.conf deleted file mode 100644 index b3ad6a33b1..0000000000 --- a/conf/perf/obsolete/vperf1-5.conf +++ /dev/null @@ -1,36 +0,0 @@ -# Like evperf-workload2-5, but single ddoc view - -performance.eperf.EVPerfClient.test_vperf1 - -params: - -# general -batch=50 -kind=json -mem_quota=7000 -spec=vperf1-5 - -# load phase -items=8000000 - -# access phase -ratio_sets=0.3 -ratio_misses=0.05 -ratio_creates=0.33 -ratio_deletes=0.25 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.03 -bg_max_ops_per_sec=1000 -fg_max_ops=100000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 diff --git a/conf/perf/obsolete/vperf3-1.conf b/conf/perf/obsolete/vperf3-1.conf deleted file mode 100644 index 297d8eeff0..0000000000 --- a/conf/perf/obsolete/vperf3-1.conf +++ /dev/null @@ -1,38 +0,0 @@ -# Like vperf1, but 8 ddocs, 1 view -# bg_ops_per_sec: 10 -# fg_ops: 2K - -performance.eperf.EVPerfClient.test_vperf3 - -params: - -# general -batch=50 -kind=json -mem_quota=7000 -spec=vperf3-1 - -# load phase -items=1000000 - -# access phase -ratio_sets=0.3 -ratio_misses=0.05 -ratio_creates=0.33 -ratio_deletes=0.25 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.03 -bg_max_ops_per_sec=10 -fg_max_ops=2000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 diff --git a/conf/perf/obsolete/vperf3-2.conf b/conf/perf/obsolete/vperf3-2.conf deleted file mode 100644 index 8959054c88..0000000000 --- a/conf/perf/obsolete/vperf3-2.conf +++ /dev/null @@ -1,38 +0,0 @@ -# Like vperf1, but 8 ddocs, 1 view -# bg_ops_per_sec: 10 -# fg_ops: 10K - -performance.eperf.EVPerfClient.test_vperf3 - -params: - -# general -batch=50 -kind=json -mem_quota=7000 -spec=vperf3-2 - -# load phase -items=1000000 - -# access phase -ratio_sets=0.3 -ratio_misses=0.05 -ratio_creates=0.33 -ratio_deletes=0.25 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.03 -bg_max_ops_per_sec=10 -fg_max_ops=10000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 diff --git a/conf/perf/obsolete/vperf3-3.conf b/conf/perf/obsolete/vperf3-3.conf deleted file mode 100644 index fb685e13f5..0000000000 --- a/conf/perf/obsolete/vperf3-3.conf +++ /dev/null @@ -1,38 +0,0 @@ -# Like vperf1, but 8 ddocs, 1 view -# bg_ops_per_sec: 1K -# fg_ops: 10K - -performance.eperf.EVPerfClient.test_vperf3 - -params: - -# general -batch=50 -kind=json -mem_quota=7000 -spec=vperf3-3 - -# load phase -items=1000000 - -# access phase -ratio_sets=0.3 -ratio_misses=0.05 -ratio_creates=0.33 -ratio_deletes=0.25 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.03 -bg_max_ops_per_sec=1000 -fg_max_ops=10000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 diff --git a/conf/perf/obsolete/vperf3-4.conf b/conf/perf/obsolete/vperf3-4.conf deleted file mode 100644 index 84f70e86bc..0000000000 --- a/conf/perf/obsolete/vperf3-4.conf +++ /dev/null @@ -1,38 +0,0 @@ -# Like vperf1, but 8 ddocs, 1 view -# bg_ops_per_sec: 1K -# fg_ops: 50K - -performance.eperf.EVPerfClient.test_vperf3 - -params: - -# general -batch=50 -kind=json -mem_quota=7000 -spec=vperf3-4 - -# load phase -items=1000000 - -# access phase -ratio_sets=0.3 -ratio_misses=0.05 -ratio_creates=0.33 -ratio_deletes=0.25 -ratio_hot=0.2 -ratio_hot_gets=0.95 -ratio_hot_sets=0.95 -ratio_expirations=0.03 -bg_max_ops_per_sec=1000 -fg_max_ops=50000 - -# control (defaults: pytests/performance/perf_defaults.py) -load_wait_until_drained=1 -loop_wait_until_drained=0 -mcsoda_heartbeat=3 -tear_down=1 -tear_down_proxy=1 -tear_down_bucket=0 -tear_down_cluster=1 -tear_down_on_setup=0 diff --git a/pytests/performance/eperf.py b/pytests/performance/eperf.py index 4e5f943f23..59c3b9eadb 100755 --- a/pytests/performance/eperf.py +++ b/pytests/performance/eperf.py @@ -1102,152 +1102,6 @@ def test_eperf_thruput(self): max_creates=self.parami("max_creates", PerfDefaults.max_creates)) - def test_evperf_workload2(self): - self.spec("evperf_workload2") - - # Load phase - num_nodes = self.parami('num_nodes', PerfDefaults.num_nodes) - if self.parami("load_phase", 0): - self.load_phase(num_nodes) - - # Index phase - view_gen = ViewGen() - ddocs = view_gen.generate_ddocs([2, 2, 4]) - self.index_phase(ddocs) - - # Access phase - limit = self.parami('limit', 10) - query_suffix = self.param("query_suffix", "") - bucket = self.params('bucket', 'default') - queries = view_gen.generate_queries(limit, query_suffix, ddocs, bucket, - use_all_docs=True) - - self.bg_max_ops_per_sec = self.parami("bg_max_ops_per_sec", 100) - self.fg_max_ops = self.parami("fg_max_ops", 1000000) - - # Rotate host so multiple clients don't hit the same HTTP/REST server. - server_sn = self.parami("prefix", 0) % len(self.input.servers) - host = self.input.servers[server_sn].ip - - self.access_phase(ratio_sets=self.paramf('ratio_sets', 0.3), - ratio_misses=self.paramf('ratio_misses', 0.05), - ratio_creates=self.paramf('ratio_creates', 0.33), - ratio_deletes=self.paramf('ratio_deletes', 0.25), - ratio_hot=self.paramf('ratio_hot', 0.2), - ratio_hot_gets=self.paramf('ratio_hot_gets', 0.95), - ratio_hot_sets=self.paramf('ratio_hot_sets', 0.95), - ratio_expirations=self.paramf('ratio_expirations', - 0.03), - max_creates=self.parami("max_creates", 30000000), - ratio_queries=self.paramf('ratio_queries', 0.3571), - queries=queries, - proto_prefix="couchbase", - host=host, - ddoc=view_gen.ddoc_names.next()) - - def test_evperf_workload3(self): - """Like workload 2 but has queries on view with reduce step""" - - self.spec('evperf_workload3') - - # Load phase - num_nodes = self.parami('num_nodes', PerfDefaults.num_nodes) - if self.parami("load_phase", 0): - self.load_phase(num_nodes) - - # Index phase - view_gen = ViewGen() - ddocs = view_gen.generate_ddocs([2, 2, 4], add_reduce=True) - self.index_phase(ddocs) - - # Access phase - limit = self.parami('limit', 10) - query_suffix = self.param('query_suffix', '') - bucket = self.params('bucket', 'default') - queries = view_gen.generate_queries(limit, query_suffix, ddocs, bucket, - use_all_docs=True, - use_reduce=True) - - self.bg_max_ops_per_sec = self.parami('bg_max_ops_per_sec', 100) - self.fg_max_ops = self.parami('fg_max_ops', 1000000) - - # Rotate host so multiple clients don't hit the same HTTP/REST server. - server_sn = self.parami("prefix", 0) % len(self.input.servers) - host = self.input.servers[server_sn].ip - - self.access_phase(ratio_sets=self.paramf('ratio_sets', 0.3), - ratio_misses=self.paramf('ratio_misses', 0.05), - ratio_creates=self.paramf('ratio_creates', 0.33), - ratio_deletes=self.paramf('ratio_deletes', 0.25), - ratio_hot=self.paramf('ratio_hot', 0.2), - ratio_hot_gets=self.paramf('ratio_hot_gets', 0.95), - ratio_hot_sets=self.paramf('ratio_hot_sets', 0.95), - ratio_expirations=self.paramf('ratio_expirations', - 0.03), - max_creates=self.parami('max_creates', 30000000), - ratio_queries=self.paramf('ratio_queries', 0.3571), - queries=queries, - proto_prefix='couchbase', - host=host, - ddoc=view_gen.ddoc_names.next()) - - def test_vperf1(self): - """1 design document, 1 view""" - - self.spec("vperf1") - - self.gated_start(self.input.clients) - - # Load phase - num_nodes = self.parami('num_nodes', PerfDefaults.num_nodes) - if self.parami("load_phase", 0): - self.load_phase(num_nodes) - - # Index phase - view_gen = ViewGen() - ddocs = {'A': {'views': {'city': {'map': view_gen.MAP_FUNCTIONS[0]}}}} - self.index_phase(ddocs) - - # Access phase - q = {'city': '/default/_design/A/_view/city?limit=20&startkey="{city}"'} - - queries_by_kind = [[q['city']]] - remaining = [1] - query_suffix = self.param("query_suffix", "") - queries = view_gen.compute_queries(queries_by_kind, remaining, - query_suffix) - queries = view_gen.join_queries(queries) - - # Rotate host so multiple clients don't hit the same HTTP/REST server. - server_sn = self.parami("prefix", 0) % len(self.input.servers) - host = self.input.servers[server_sn].ip - - self.access_phase(ratio_sets=self.paramf('ratio_sets', - PerfDefaults.ratio_sets), - ratio_misses=self.paramf('ratio_misses', - PerfDefaults.ratio_misses), - ratio_creates=self.paramf('ratio_creates', - PerfDefaults.ratio_creates), - ratio_deletes=self.paramf('ratio_deletes', - PerfDefaults.ratio_deletes), - ratio_hot=self.paramf('ratio_hot', - PerfDefaults.ratio_hot), - ratio_hot_gets=self.paramf('ratio_hot_gets', - PerfDefaults.ratio_hot_gets), - ratio_hot_sets=self.paramf('ratio_hot_sets', - PerfDefaults.ratio_hot_sets), - ratio_expirations=self.paramf('ratio_expirations', - PerfDefaults.ratio_expirations), - max_creates=self.parami("max_creates", - PerfDefaults.max_creates), - queries=queries, - proto_prefix="couchbase", - host=host, - ddoc=view_gen.ddoc_names.next()) - - if self.parami("debug_phase", 0): - self.debug_phase(ddocs) - def test_vperf2(self): """1 design document, 8 views""" @@ -1268,8 +1122,7 @@ def test_vperf2(self): limit = self.parami('limit', 10) query_suffix = self.param("query_suffix", "") bucket = self.params('bucket', 'default') - queries = view_gen.generate_queries(limit, query_suffix, ddocs, bucket, - use_all_docs=False) + queries = view_gen.generate_queries(limit, query_suffix, ddocs, bucket) self.bg_max_ops_per_sec = self.parami('bg_max_ops_per_sec', 100) self.fg_max_ops = self.parami('fg_max_ops', 1000000) @@ -1301,57 +1154,8 @@ def test_vperf2(self): if self.parami("debug_phase", 0): self.debug_phase(ddocs) - def test_vperf3(self): - """8 design documents, 1 view""" - - self.spec("vperf3") - - self.gated_start(self.input.clients) - - # Load phase - if self.parami("load_phase", 0): - self.load_phase(self.parami('num_nodes', 10)) - - # Index phase - view_gen = ViewGen() - ddocs = view_gen.generate_ddocs([1, 1, 1, 1, 1, 1, 1, 1]) - self.index_phase(ddocs) - - # Access phase - limit = self.parami('limit', 10) - query_suffix = self.param("query_suffix", "") - bucket = self.params('bucket', 'default') - queries = view_gen.generate_queries(limit, query_suffix, ddocs, bucket, - use_all_docs=False) - - self.bg_max_ops_per_sec = self.parami('bg_max_ops_per_sec', 100) - self.fg_max_ops = self.parami('fg_max_ops', 1000000) - - # Rotate host so multiple clients don't hit the same HTTP/REST server. - server_sn = self.parami("prefix", 0) % len(self.input.servers) - host = self.input.servers[server_sn].ip - - self.access_phase(ratio_sets=self.paramf('ratio_sets', 0.3), - ratio_misses=self.paramf('ratio_misses', 0.05), - ratio_creates=self.paramf('ratio_creates', 0.33), - ratio_deletes=self.paramf('ratio_deletes', 0.25), - ratio_hot=self.paramf('ratio_hot', 0.2), - ratio_hot_gets=self.paramf('ratio_hot_gets', 0.95), - ratio_hot_sets=self.paramf('ratio_hot_sets', 0.95), - ratio_expirations=self.paramf('ratio_expirations', - 0.03), - max_creates=self.parami("max_creates", 30000000), - ratio_queries=self.paramf('ratio_queries', 0.3571), - queries=queries, - proto_prefix="couchbase", - host=host, - ddoc=view_gen.ddoc_names.next()) - - if self.parami("debug_phase", 0): - self.debug_phase(ddocs) - def test_vperf4(self): - """Like workload 2 but without queries on primary index""" + """3 design documents, 2-2-4 view""" self.spec("vperf4") @@ -1370,103 +1174,7 @@ def test_vperf4(self): limit = self.parami('limit', 10) query_suffix = self.param("query_suffix", "") bucket = self.params('bucket', 'default') - queries = view_gen.generate_queries(limit, query_suffix, ddocs, bucket, - use_all_docs=False, - use_reduce=False) - - self.bg_max_ops_per_sec = self.parami('bg_max_ops_per_sec', 100) - self.fg_max_ops = self.parami('fg_max_ops', 1000000) - - # Rotate host so multiple clients don't hit the same HTTP/REST server. - server_sn = self.parami("prefix", 0) % len(self.input.servers) - host = self.input.servers[server_sn].ip - - self.access_phase(ratio_sets=self.paramf('ratio_sets', 0.3), - ratio_misses=self.paramf('ratio_misses', 0.05), - ratio_creates=self.paramf('ratio_creates', 0.33), - ratio_deletes=self.paramf('ratio_deletes', 0.25), - ratio_hot=self.paramf('ratio_hot', 0.2), - ratio_hot_gets=self.paramf('ratio_hot_gets', 0.95), - ratio_hot_sets=self.paramf('ratio_hot_sets', 0.95), - ratio_expirations=self.paramf('ratio_expirations', - 0.03), - max_creates=self.parami("max_creates", 30000000), - ratio_queries=self.paramf('ratio_queries', 0.3571), - queries=queries, - proto_prefix="couchbase", - host=host, - ddoc=view_gen.ddoc_names.next()) - - if self.parami("debug_phase", 0): - self.debug_phase(ddocs) - - def test_vperf5(self): - """Only queries on primary index""" - - self.spec("vperf5") - - self.gated_start(self.input.clients) - - # Load phase - if self.parami("load_phase", 0): - self.load_phase(self.parami('num_nodes', 10)) - - # Index phase - pass - - # Access phase - limit = self.parami('limit', 10) - query_suffix = self.param("query_suffix", "") - view_gen = ViewGen() - bucket = self.params('bucket', 'default') - queries = view_gen.generate_queries(limit, query_suffix, bucket) - - self.bg_max_ops_per_sec = self.parami('bg_max_ops_per_sec', 100) - self.fg_max_ops = self.parami('fg_max_ops', 1000000) - - # Rotate host so multiple clients don't hit the same HTTP/REST server. - server_sn = self.parami("prefix", 0) % len(self.input.servers) - host = self.input.servers[server_sn].ip - - self.access_phase(ratio_sets=self.paramf('ratio_sets', 0.3), - ratio_misses=self.paramf('ratio_misses', 0.05), - ratio_creates=self.paramf('ratio_creates', 0.33), - ratio_deletes=self.paramf('ratio_deletes', 0.25), - ratio_hot=self.paramf('ratio_hot', 0.2), - ratio_hot_gets=self.paramf('ratio_hot_gets', 0.95), - ratio_hot_sets=self.paramf('ratio_hot_sets', 0.95), - ratio_expirations=self.paramf('ratio_expirations', - 0.03), - max_creates=self.parami("max_creates", 30000000), - ratio_queries=self.paramf('ratio_queries', 0.3571), - queries=queries, - proto_prefix="couchbase", - host=host, - ddoc=view_gen.ddoc_names.next()) - - def test_vperf6(self): - """Only queries on pseudo primary index""" - - self.spec("vperf6") - - self.gated_start(self.input.clients) - - # Load phase - if self.parami("load_phase", 0): - self.load_phase(self.parami('num_nodes', 10)) - - # Index phase - view_gen = ViewGen() - ddocs = view_gen.generate_all_docs_view() - self.index_phase(ddocs) - - # Access phase - limit = self.parami('limit', 10) - query_suffix = self.param("query_suffix", "") - view_gen = ViewGen() - bucket = self.params('bucket', 'default') - queries = view_gen.generate_queries(limit, query_suffix, ddocs, bucket, - pseudo=True) + queries = view_gen.generate_queries(limit, query_suffix, ddocs, bucket) self.bg_max_ops_per_sec = self.parami('bg_max_ops_per_sec', 100) self.fg_max_ops = self.parami('fg_max_ops', 1000000) @@ -1517,7 +1225,7 @@ def test_evperf2(self): query_suffix = self.param("query_suffix", "") bucket = self.params('bucket', 'default') queries = view_gen.generate_queries(limit, query_suffix, ddocs, bucket, - use_all_docs=False, extend=True) + extend=True) # Rotate host so multiple clients don't hit the same HTTP/REST server. server_sn = self.parami("prefix", 0) % len(self.input.servers) diff --git a/pytests/performance/viewgen.py b/pytests/performance/viewgen.py index 27ff507f21..d0a38b8e5c 100644 --- a/pytests/performance/viewgen.py +++ b/pytests/performance/viewgen.py @@ -119,7 +119,6 @@ def generate_all_docs_view(self): return {'all': {'views': {'docs': {'map': MAP_FUNCTION}}}} def generate_queries(self, limit, query_suffix, ddocs, bucket='default', - use_all_docs=False, use_reduce=False, pseudo=False, extend=False): """Generate string from permuted queries. @@ -143,15 +142,6 @@ def generate_queries(self, limit, query_suffix, ddocs, bucket='default', query_suffix) return self.join_queries(queries) - # Pseudo all docs case - if pseudo: - queries_by_kind =\ - [[b + '_design/all/_view/docs?limit=' + str(limit) + '&startkey="{key}"']] - remaining = [1] - queries = self.compute_queries(queries_by_kind, remaining, - query_suffix) - return self.join_queries(queries) - # General case ddoc_names =\ [name for name, ddoc in sorted(ddocs.iteritems()) for view in ddoc["views"]] @@ -191,17 +181,6 @@ def generate_queries(self, limit, query_suffix, ddocs, bucket='default', remaining = [9, 6, 5] - if use_all_docs: - q['all_docs'] = b + '_all_docs?limit=' + str(limit) +\ - '&startkey="{key}"' - queries_by_kind = [[q['all_docs']]] + queries_by_kind - remaining = [5] + remaining - - if use_reduce: - q['reduce'] = b + '_design/reduce/_view/reduce?limit=' + str(limit) - queries_by_kind = queries_by_kind + [[q['reduce']]] - remaining = remaining + [5] - queries = self.compute_queries(queries_by_kind, remaining, query_suffix) if extend: