From 89e456adabd99314d88c4d4538e1e99de3bafcae Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 26 Mar 2016 09:18:41 -0400 Subject: [PATCH] suites: run rados bench for max 180 seconds If we want a longer runtime than that, run it several times in sequence. This limits the amount of disk space we'll consume. Signed-off-by: Sage Weil (cherry picked from commit 2b3ec8de8d08d9a2b694f898f47d8ca27d0aff1f) --- suites/powercycle/osd/tasks/radosbench.yaml | 25 +++++++++++++++-- .../workloads/ec-radosbench.yaml | 21 ++++++++++---- suites/rados/thrash/workloads/radosbench.yaml | 16 +++++++++-- .../7-workload/radosbench.yaml | 16 +++++++++-- suites/smoke/basic/tasks/rados_bench.yaml | 17 ++++++++--- .../stress-split/07-workload/radosbench.yaml | 28 +++++++++++++++++-- .../stress-split/19-workload/radosbench.yaml | 28 +++++++++++++++++-- .../stress-split/7-workload/radosbench.yaml | 26 ++++++++++++++++- .../stress-split/7-workload/radosbench.yaml | 26 ++++++++++++++++- 9 files changed, 177 insertions(+), 26 deletions(-) diff --git a/suites/powercycle/osd/tasks/radosbench.yaml b/suites/powercycle/osd/tasks/radosbench.yaml index 656db858f0188..7fb27b25a6198 100644 --- a/suites/powercycle/osd/tasks/radosbench.yaml +++ b/suites/powercycle/osd/tasks/radosbench.yaml @@ -1,4 +1,23 @@ tasks: -- radosbench: - clients: [client.0] - time: 200 +- full_sequential: + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 diff --git a/suites/rados/thrash-erasure-code/workloads/ec-radosbench.yaml b/suites/rados/thrash-erasure-code/workloads/ec-radosbench.yaml index 7aaf0e1c30b1b..d2fab6989e142 100644 --- a/suites/rados/thrash-erasure-code/workloads/ec-radosbench.yaml +++ b/suites/rados/thrash-erasure-code/workloads/ec-radosbench.yaml @@ -1,6 +1,17 @@ tasks: -- radosbench: - clients: [client.0] - time: 300 - unique_pool: true - ec_pool: true +- full_sequential: + - radosbench: + clients: [client.0] + time: 180 + unique_pool: true + ec_pool: true + - radosbench: + clients: [client.0] + time: 180 + unique_pool: true + ec_pool: true + - radosbench: + clients: [client.0] + time: 180 + unique_pool: true + ec_pool: true diff --git a/suites/rados/thrash/workloads/radosbench.yaml b/suites/rados/thrash/workloads/radosbench.yaml index ae7a696d9ae91..3a3f9ae70cd14 100644 --- a/suites/rados/thrash/workloads/radosbench.yaml +++ b/suites/rados/thrash/workloads/radosbench.yaml @@ -6,6 +6,16 @@ overrides: debug objecter: 20 debug rados: 20 tasks: -- radosbench: - clients: [client.0] - time: 200 +- full_sequential: + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 diff --git a/suites/rados/upgrade/hammer-x-singleton/7-workload/radosbench.yaml b/suites/rados/upgrade/hammer-x-singleton/7-workload/radosbench.yaml index c7ea69bc14cb7..a471cf8720b5b 100644 --- a/suites/rados/upgrade/hammer-x-singleton/7-workload/radosbench.yaml +++ b/suites/rados/upgrade/hammer-x-singleton/7-workload/radosbench.yaml @@ -1,5 +1,15 @@ tasks: -- radosbench: - clients: [client.0] - time: 900 +- full_sequential: + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 - print: "**** done radosbench 7-workload" diff --git a/suites/smoke/basic/tasks/rados_bench.yaml b/suites/smoke/basic/tasks/rados_bench.yaml index f93b4a610ce99..a70fb449037cf 100644 --- a/suites/smoke/basic/tasks/rados_bench.yaml +++ b/suites/smoke/basic/tasks/rados_bench.yaml @@ -18,7 +18,16 @@ tasks: chance_pgnum_grow: 2 chance_pgpnum_fix: 1 timeout: 1200 -- radosbench: - clients: - - client.0 - time: 1800 +- full_sequential: + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 diff --git a/suites/upgrade/firefly-hammer-x/stress-split/07-workload/radosbench.yaml b/suites/upgrade/firefly-hammer-x/stress-split/07-workload/radosbench.yaml index 447b31bc754e4..f05fc511192fc 100644 --- a/suites/upgrade/firefly-hammer-x/stress-split/07-workload/radosbench.yaml +++ b/suites/upgrade/firefly-hammer-x/stress-split/07-workload/radosbench.yaml @@ -1,5 +1,27 @@ tasks: -- radosbench: - clients: [client.0] - time: 1800 +- full_sequential: + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 - print: "**** done 07-workload/radosbench.yaml" diff --git a/suites/upgrade/firefly-hammer-x/stress-split/19-workload/radosbench.yaml b/suites/upgrade/firefly-hammer-x/stress-split/19-workload/radosbench.yaml index ce856cfbdbd51..7b72d946af400 100644 --- a/suites/upgrade/firefly-hammer-x/stress-split/19-workload/radosbench.yaml +++ b/suites/upgrade/firefly-hammer-x/stress-split/19-workload/radosbench.yaml @@ -1,5 +1,27 @@ tasks: -- radosbench: - clients: [client.0] - time: 1800 +- full_sequential: + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 - print: "**** done 19-workload/radosbench.yaml" diff --git a/suites/upgrade/hammer-x/stress-split/7-workload/radosbench.yaml b/suites/upgrade/hammer-x/stress-split/7-workload/radosbench.yaml index 4ec14650a3a99..9bc489f4a3f82 100644 --- a/suites/upgrade/hammer-x/stress-split/7-workload/radosbench.yaml +++ b/suites/upgrade/hammer-x/stress-split/7-workload/radosbench.yaml @@ -2,5 +2,29 @@ tasks: - full_sequential: - radosbench: clients: [client.0] - time: 1800 + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 - print: "**** done radosbench 7-workload" diff --git a/suites/upgrade/infernalis-x/stress-split/7-workload/radosbench.yaml b/suites/upgrade/infernalis-x/stress-split/7-workload/radosbench.yaml index e2aa5dc9a9c43..17d4d71f9fa03 100644 --- a/suites/upgrade/infernalis-x/stress-split/7-workload/radosbench.yaml +++ b/suites/upgrade/infernalis-x/stress-split/7-workload/radosbench.yaml @@ -6,5 +6,29 @@ tasks: - full_sequential: - radosbench: clients: [client.0] - time: 1800 + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 + - radosbench: + clients: [client.0] + time: 180 - print: "**** done radosbench 7-workload" -- 2.39.5