From 7646133eeae6dab1222c34eac16ef654f5059b28 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 27 Jul 2013 18:26:14 -0700 Subject: [PATCH] upgrade-parallel: restart mon after starting osd thrasher The tell mon.* currently blocks forever if all mons aren't up. --- .../stress-split/2-partial-upgrade/firsthalf.yaml | 4 +--- suites/upgrade-parallel/stress-split/4-mon/more.yaml | 5 +++++ .../{4-workload => 5-workload}/rados_api_tests.yaml | 0 .../stress-split/{4-workload => 5-workload}/radosbench.yaml | 0 .../stress-split/{4-workload => 5-workload}/readwrite.yaml | 0 .../{4-workload => 5-workload}/snaps-few-objects.yaml | 0 .../{4-workload => 5-workload}/snaps-many-objects.yaml | 0 .../stress-split/{5-next-mon => 6-next-mon}/monb.yaml | 0 .../{6-workload => 7-workload}/rados_api_tests.yaml | 0 9 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 suites/upgrade-parallel/stress-split/4-mon/more.yaml rename suites/upgrade-parallel/stress-split/{4-workload => 5-workload}/rados_api_tests.yaml (100%) rename suites/upgrade-parallel/stress-split/{4-workload => 5-workload}/radosbench.yaml (100%) rename suites/upgrade-parallel/stress-split/{4-workload => 5-workload}/readwrite.yaml (100%) rename suites/upgrade-parallel/stress-split/{4-workload => 5-workload}/snaps-few-objects.yaml (100%) rename suites/upgrade-parallel/stress-split/{4-workload => 5-workload}/snaps-many-objects.yaml (100%) rename suites/upgrade-parallel/stress-split/{5-next-mon => 6-next-mon}/monb.yaml (100%) rename suites/upgrade-parallel/stress-split/{6-workload => 7-workload}/rados_api_tests.yaml (100%) diff --git a/suites/upgrade-parallel/stress-split/2-partial-upgrade/firsthalf.yaml b/suites/upgrade-parallel/stress-split/2-partial-upgrade/firsthalf.yaml index 804f1bb5c2eeb..c843c7be5d4da 100644 --- a/suites/upgrade-parallel/stress-split/2-partial-upgrade/firsthalf.yaml +++ b/suites/upgrade-parallel/stress-split/2-partial-upgrade/firsthalf.yaml @@ -3,6 +3,4 @@ tasks: all: branch: next - ceph.restart: - daemons: [osd.0, osd.1, osd.2, mon.a] - wait-for-healthy: false - wait-for-osds-up: true + daemons: [osd.0, osd.1, osd.2] diff --git a/suites/upgrade-parallel/stress-split/4-mon/more.yaml b/suites/upgrade-parallel/stress-split/4-mon/more.yaml new file mode 100644 index 0000000000000..b6ffb3323d11e --- /dev/null +++ b/suites/upgrade-parallel/stress-split/4-mon/more.yaml @@ -0,0 +1,5 @@ +tasks: +- ceph.restart: + daemons: [mon.a] + wait-for-healthy: false + wait-for-osds-up: true diff --git a/suites/upgrade-parallel/stress-split/4-workload/rados_api_tests.yaml b/suites/upgrade-parallel/stress-split/5-workload/rados_api_tests.yaml similarity index 100% rename from suites/upgrade-parallel/stress-split/4-workload/rados_api_tests.yaml rename to suites/upgrade-parallel/stress-split/5-workload/rados_api_tests.yaml diff --git a/suites/upgrade-parallel/stress-split/4-workload/radosbench.yaml b/suites/upgrade-parallel/stress-split/5-workload/radosbench.yaml similarity index 100% rename from suites/upgrade-parallel/stress-split/4-workload/radosbench.yaml rename to suites/upgrade-parallel/stress-split/5-workload/radosbench.yaml diff --git a/suites/upgrade-parallel/stress-split/4-workload/readwrite.yaml b/suites/upgrade-parallel/stress-split/5-workload/readwrite.yaml similarity index 100% rename from suites/upgrade-parallel/stress-split/4-workload/readwrite.yaml rename to suites/upgrade-parallel/stress-split/5-workload/readwrite.yaml diff --git a/suites/upgrade-parallel/stress-split/4-workload/snaps-few-objects.yaml b/suites/upgrade-parallel/stress-split/5-workload/snaps-few-objects.yaml similarity index 100% rename from suites/upgrade-parallel/stress-split/4-workload/snaps-few-objects.yaml rename to suites/upgrade-parallel/stress-split/5-workload/snaps-few-objects.yaml diff --git a/suites/upgrade-parallel/stress-split/4-workload/snaps-many-objects.yaml b/suites/upgrade-parallel/stress-split/5-workload/snaps-many-objects.yaml similarity index 100% rename from suites/upgrade-parallel/stress-split/4-workload/snaps-many-objects.yaml rename to suites/upgrade-parallel/stress-split/5-workload/snaps-many-objects.yaml diff --git a/suites/upgrade-parallel/stress-split/5-next-mon/monb.yaml b/suites/upgrade-parallel/stress-split/6-next-mon/monb.yaml similarity index 100% rename from suites/upgrade-parallel/stress-split/5-next-mon/monb.yaml rename to suites/upgrade-parallel/stress-split/6-next-mon/monb.yaml diff --git a/suites/upgrade-parallel/stress-split/6-workload/rados_api_tests.yaml b/suites/upgrade-parallel/stress-split/7-workload/rados_api_tests.yaml similarity index 100% rename from suites/upgrade-parallel/stress-split/6-workload/rados_api_tests.yaml rename to suites/upgrade-parallel/stress-split/7-workload/rados_api_tests.yaml -- 2.39.5