From 1e75e23b9973c9c5203b3c3ed2cec35333b40d77 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 1 Feb 2017 15:24:50 -0500 Subject: [PATCH] qa/suites/upgrade/hammer-x: wrap thrash and workloads We need the thrashing to stop before we do the final upgrade step. Signed-off-by: Sage Weil --- qa/suites/upgrade/hammer-x/stress-split/3-thrash/default.yaml | 3 +++ qa/suites/upgrade/hammer-x/stress-split/4-mon/mona.yaml | 2 +- .../upgrade/hammer-x/stress-split/5-workload/rbd-cls.yaml | 2 +- .../hammer-x/stress-split/5-workload/rbd-import-export.yaml | 2 +- .../upgrade/hammer-x/stress-split/5-workload/readwrite.yaml | 2 +- .../hammer-x/stress-split/5-workload/snaps-few-objects.yaml | 2 +- qa/suites/upgrade/hammer-x/stress-split/6-next-mon/monb.yaml | 2 +- .../upgrade/hammer-x/stress-split/7-workload/radosbench.yaml | 2 +- .../upgrade/hammer-x/stress-split/7-workload/rbd_api.yaml | 2 +- 9 files changed, 11 insertions(+), 8 deletions(-) diff --git a/qa/suites/upgrade/hammer-x/stress-split/3-thrash/default.yaml b/qa/suites/upgrade/hammer-x/stress-split/3-thrash/default.yaml index 3cd3fc20233..f9ee5892885 100644 --- a/qa/suites/upgrade/hammer-x/stress-split/3-thrash/default.yaml +++ b/qa/suites/upgrade/hammer-x/stress-split/3-thrash/default.yaml @@ -8,6 +8,9 @@ overrides: - detected stalls on CPUs - failed to encode map e tasks: +- parallel: + - stress-tasks +stress-tasks: - thrashosds: timeout: 1200 chance_pgnum_grow: 1 diff --git a/qa/suites/upgrade/hammer-x/stress-split/4-mon/mona.yaml b/qa/suites/upgrade/hammer-x/stress-split/4-mon/mona.yaml index 7c75c102fc4..f8ff6474b5e 100644 --- a/qa/suites/upgrade/hammer-x/stress-split/4-mon/mona.yaml +++ b/qa/suites/upgrade/hammer-x/stress-split/4-mon/mona.yaml @@ -1,4 +1,4 @@ -tasks: +stress-tasks: - ceph.restart: daemons: [mon.a] wait-for-healthy: false diff --git a/qa/suites/upgrade/hammer-x/stress-split/5-workload/rbd-cls.yaml b/qa/suites/upgrade/hammer-x/stress-split/5-workload/rbd-cls.yaml index 1bcd1b8ccad..d75eb056ed8 100644 --- a/qa/suites/upgrade/hammer-x/stress-split/5-workload/rbd-cls.yaml +++ b/qa/suites/upgrade/hammer-x/stress-split/5-workload/rbd-cls.yaml @@ -1,4 +1,4 @@ -tasks: +stress-tasks: - workunit: branch: hammer clients: diff --git a/qa/suites/upgrade/hammer-x/stress-split/5-workload/rbd-import-export.yaml b/qa/suites/upgrade/hammer-x/stress-split/5-workload/rbd-import-export.yaml index 882d979c89a..e29ccf9613e 100644 --- a/qa/suites/upgrade/hammer-x/stress-split/5-workload/rbd-import-export.yaml +++ b/qa/suites/upgrade/hammer-x/stress-split/5-workload/rbd-import-export.yaml @@ -1,4 +1,4 @@ -tasks: +stress-tasks: - workunit: branch: hammer clients: diff --git a/qa/suites/upgrade/hammer-x/stress-split/5-workload/readwrite.yaml b/qa/suites/upgrade/hammer-x/stress-split/5-workload/readwrite.yaml index 2fe02b3c7c7..8ee559a054a 100644 --- a/qa/suites/upgrade/hammer-x/stress-split/5-workload/readwrite.yaml +++ b/qa/suites/upgrade/hammer-x/stress-split/5-workload/readwrite.yaml @@ -1,4 +1,4 @@ -tasks: +stress-tasks: - full_sequential: - rados: clients: [client.0] diff --git a/qa/suites/upgrade/hammer-x/stress-split/5-workload/snaps-few-objects.yaml b/qa/suites/upgrade/hammer-x/stress-split/5-workload/snaps-few-objects.yaml index 9f8b7bb83e8..0136e9ed4b4 100644 --- a/qa/suites/upgrade/hammer-x/stress-split/5-workload/snaps-few-objects.yaml +++ b/qa/suites/upgrade/hammer-x/stress-split/5-workload/snaps-few-objects.yaml @@ -1,4 +1,4 @@ -tasks: +stress-tasks: - full_sequential: - rados: clients: [client.0] diff --git a/qa/suites/upgrade/hammer-x/stress-split/6-next-mon/monb.yaml b/qa/suites/upgrade/hammer-x/stress-split/6-next-mon/monb.yaml index 22e87c7ad21..fbff55f28ff 100644 --- a/qa/suites/upgrade/hammer-x/stress-split/6-next-mon/monb.yaml +++ b/qa/suites/upgrade/hammer-x/stress-split/6-next-mon/monb.yaml @@ -1,4 +1,4 @@ -tasks: +stress-tasks: - ceph.restart: daemons: [mon.b] wait-for-healthy: false diff --git a/qa/suites/upgrade/hammer-x/stress-split/7-workload/radosbench.yaml b/qa/suites/upgrade/hammer-x/stress-split/7-workload/radosbench.yaml index a940015b374..8f8ddbea566 100644 --- a/qa/suites/upgrade/hammer-x/stress-split/7-workload/radosbench.yaml +++ b/qa/suites/upgrade/hammer-x/stress-split/7-workload/radosbench.yaml @@ -1,4 +1,4 @@ -tasks: +stress-tasks: - full_sequential: - radosbench: clients: [client.0] diff --git a/qa/suites/upgrade/hammer-x/stress-split/7-workload/rbd_api.yaml b/qa/suites/upgrade/hammer-x/stress-split/7-workload/rbd_api.yaml index 19a24c2a7f5..434465cd27a 100644 --- a/qa/suites/upgrade/hammer-x/stress-split/7-workload/rbd_api.yaml +++ b/qa/suites/upgrade/hammer-x/stress-split/7-workload/rbd_api.yaml @@ -1,4 +1,4 @@ -tasks: +stress-tasks: - workunit: branch: hammer clients: -- 2.47.3