From 12af9b7292058a9dd8a8c71da0653dcf3400e762 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Tue, 24 Mar 2015 20:12:56 +0100 Subject: [PATCH] erasure-code: rename firefly-x/stress-split-erasure-code Rename sub-directories of firefly-x/stress-split-erasure-code make room for a workload immediately after the installation, i.e. number 2. Signed-off-by: Loic Dachary --- .../upgrade/firefly-x/parallel-erasure-code/% | 0 .../firefly-x/parallel-erasure-code/0-cluster | 1 + .../parallel-erasure-code/1-firefly-install | 1 + .../parallel-erasure-code/3-upgrade-sequence | 1 + .../parallel-erasure-code/4-final-workload | 1 + .../firefly-x/parallel-erasure-code/distros | 1 + .../stress-split-erasure-code/0-cluster | 1 - .../0-cluster/start.yaml | 25 +++++++++++++++++++ .../1-firefly-install | 1 - .../1-firefly-install/firefly.yaml | 5 ++++ .../2-partial-upgrade | 1 - .../3-partial-upgrade/firsthalf.yaml | 5 ++++ .../firefly-x/stress-split-erasure-code/4-mon | 1 - .../{3-thrash => 4-thrash}/default.yaml | 0 .../stress-split-erasure-code/5-mon/mona.yaml | 5 ++++ .../stress-split-erasure-code/6-next-mon | 1 - .../ec-rados-default.yaml | 0 .../7-next-mon/monb.yaml | 5 ++++ .../stress-split-erasure-code/8-next-mon | 1 - .../8-next-mon/monc.yaml | 6 +++++ .../stress-split-erasure-code/distros | 2 +- 21 files changed, 57 insertions(+), 7 deletions(-) create mode 100644 suites/upgrade/firefly-x/parallel-erasure-code/% create mode 120000 suites/upgrade/firefly-x/parallel-erasure-code/0-cluster create mode 120000 suites/upgrade/firefly-x/parallel-erasure-code/1-firefly-install create mode 120000 suites/upgrade/firefly-x/parallel-erasure-code/3-upgrade-sequence create mode 120000 suites/upgrade/firefly-x/parallel-erasure-code/4-final-workload create mode 120000 suites/upgrade/firefly-x/parallel-erasure-code/distros delete mode 120000 suites/upgrade/firefly-x/stress-split-erasure-code/0-cluster create mode 100644 suites/upgrade/firefly-x/stress-split-erasure-code/0-cluster/start.yaml delete mode 120000 suites/upgrade/firefly-x/stress-split-erasure-code/1-firefly-install create mode 100644 suites/upgrade/firefly-x/stress-split-erasure-code/1-firefly-install/firefly.yaml delete mode 120000 suites/upgrade/firefly-x/stress-split-erasure-code/2-partial-upgrade create mode 100644 suites/upgrade/firefly-x/stress-split-erasure-code/3-partial-upgrade/firsthalf.yaml delete mode 120000 suites/upgrade/firefly-x/stress-split-erasure-code/4-mon rename suites/upgrade/firefly-x/stress-split-erasure-code/{3-thrash => 4-thrash}/default.yaml (100%) create mode 100644 suites/upgrade/firefly-x/stress-split-erasure-code/5-mon/mona.yaml delete mode 120000 suites/upgrade/firefly-x/stress-split-erasure-code/6-next-mon rename suites/upgrade/firefly-x/stress-split-erasure-code/{5-workload => 6-workload}/ec-rados-default.yaml (100%) create mode 100644 suites/upgrade/firefly-x/stress-split-erasure-code/7-next-mon/monb.yaml delete mode 120000 suites/upgrade/firefly-x/stress-split-erasure-code/8-next-mon create mode 100644 suites/upgrade/firefly-x/stress-split-erasure-code/8-next-mon/monc.yaml diff --git a/suites/upgrade/firefly-x/parallel-erasure-code/% b/suites/upgrade/firefly-x/parallel-erasure-code/% new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/suites/upgrade/firefly-x/parallel-erasure-code/0-cluster b/suites/upgrade/firefly-x/parallel-erasure-code/0-cluster new file mode 120000 index 0000000000000..877aba862bbdc --- /dev/null +++ b/suites/upgrade/firefly-x/parallel-erasure-code/0-cluster @@ -0,0 +1 @@ +../parallel/0-cluster \ No newline at end of file diff --git a/suites/upgrade/firefly-x/parallel-erasure-code/1-firefly-install b/suites/upgrade/firefly-x/parallel-erasure-code/1-firefly-install new file mode 120000 index 0000000000000..d569e006c7e7b --- /dev/null +++ b/suites/upgrade/firefly-x/parallel-erasure-code/1-firefly-install @@ -0,0 +1 @@ +../parallel/1-firefly-install \ No newline at end of file diff --git a/suites/upgrade/firefly-x/parallel-erasure-code/3-upgrade-sequence b/suites/upgrade/firefly-x/parallel-erasure-code/3-upgrade-sequence new file mode 120000 index 0000000000000..ab64a5fc02fb3 --- /dev/null +++ b/suites/upgrade/firefly-x/parallel-erasure-code/3-upgrade-sequence @@ -0,0 +1 @@ +../parallel/3-upgrade-sequence \ No newline at end of file diff --git a/suites/upgrade/firefly-x/parallel-erasure-code/4-final-workload b/suites/upgrade/firefly-x/parallel-erasure-code/4-final-workload new file mode 120000 index 0000000000000..4f8f10f5c6feb --- /dev/null +++ b/suites/upgrade/firefly-x/parallel-erasure-code/4-final-workload @@ -0,0 +1 @@ +../parallel/4-final-workload \ No newline at end of file diff --git a/suites/upgrade/firefly-x/parallel-erasure-code/distros b/suites/upgrade/firefly-x/parallel-erasure-code/distros new file mode 120000 index 0000000000000..ecffa88e4987d --- /dev/null +++ b/suites/upgrade/firefly-x/parallel-erasure-code/distros @@ -0,0 +1 @@ +../parallel/distros \ No newline at end of file diff --git a/suites/upgrade/firefly-x/stress-split-erasure-code/0-cluster b/suites/upgrade/firefly-x/stress-split-erasure-code/0-cluster deleted file mode 120000 index 6dceffa2f5b6e..0000000000000 --- a/suites/upgrade/firefly-x/stress-split-erasure-code/0-cluster +++ /dev/null @@ -1 +0,0 @@ -../stress-split/0-cluster \ No newline at end of file diff --git a/suites/upgrade/firefly-x/stress-split-erasure-code/0-cluster/start.yaml b/suites/upgrade/firefly-x/stress-split-erasure-code/0-cluster/start.yaml new file mode 100644 index 0000000000000..9ea0a27f82a2f --- /dev/null +++ b/suites/upgrade/firefly-x/stress-split-erasure-code/0-cluster/start.yaml @@ -0,0 +1,25 @@ +overrides: + ceph: + conf: + mon: + mon warn on legacy crush tunables: false +roles: +- - mon.a + - mon.b + - mon.c + - mds.a + - osd.0 + - osd.1 + - osd.2 + - osd.3 + - osd.4 + - osd.5 + - osd.6 +- - osd.7 + - osd.8 + - osd.9 + - osd.10 + - osd.11 + - osd.12 + - osd.13 +- - client.0 diff --git a/suites/upgrade/firefly-x/stress-split-erasure-code/1-firefly-install b/suites/upgrade/firefly-x/stress-split-erasure-code/1-firefly-install deleted file mode 120000 index fad6450f52d16..0000000000000 --- a/suites/upgrade/firefly-x/stress-split-erasure-code/1-firefly-install +++ /dev/null @@ -1 +0,0 @@ -../stress-split/1-firefly-install \ No newline at end of file diff --git a/suites/upgrade/firefly-x/stress-split-erasure-code/1-firefly-install/firefly.yaml b/suites/upgrade/firefly-x/stress-split-erasure-code/1-firefly-install/firefly.yaml new file mode 100644 index 0000000000000..a3573817aa0aa --- /dev/null +++ b/suites/upgrade/firefly-x/stress-split-erasure-code/1-firefly-install/firefly.yaml @@ -0,0 +1,5 @@ +tasks: +- install: + branch: firefly +- ceph: + fs: xfs diff --git a/suites/upgrade/firefly-x/stress-split-erasure-code/2-partial-upgrade b/suites/upgrade/firefly-x/stress-split-erasure-code/2-partial-upgrade deleted file mode 120000 index c3a4e2c28e598..0000000000000 --- a/suites/upgrade/firefly-x/stress-split-erasure-code/2-partial-upgrade +++ /dev/null @@ -1 +0,0 @@ -../stress-split/2-partial-upgrade \ No newline at end of file diff --git a/suites/upgrade/firefly-x/stress-split-erasure-code/3-partial-upgrade/firsthalf.yaml b/suites/upgrade/firefly-x/stress-split-erasure-code/3-partial-upgrade/firsthalf.yaml new file mode 100644 index 0000000000000..43526c48b6bc5 --- /dev/null +++ b/suites/upgrade/firefly-x/stress-split-erasure-code/3-partial-upgrade/firsthalf.yaml @@ -0,0 +1,5 @@ +tasks: +- install.upgrade: + osd.0: +- ceph.restart: + daemons: [osd.0, osd.1, osd.2, osd.3, osd.4, osd.5, osd.6] diff --git a/suites/upgrade/firefly-x/stress-split-erasure-code/4-mon b/suites/upgrade/firefly-x/stress-split-erasure-code/4-mon deleted file mode 120000 index 0ea7dd5aa8d59..0000000000000 --- a/suites/upgrade/firefly-x/stress-split-erasure-code/4-mon +++ /dev/null @@ -1 +0,0 @@ -../stress-split/4-mon \ No newline at end of file diff --git a/suites/upgrade/firefly-x/stress-split-erasure-code/3-thrash/default.yaml b/suites/upgrade/firefly-x/stress-split-erasure-code/4-thrash/default.yaml similarity index 100% rename from suites/upgrade/firefly-x/stress-split-erasure-code/3-thrash/default.yaml rename to suites/upgrade/firefly-x/stress-split-erasure-code/4-thrash/default.yaml diff --git a/suites/upgrade/firefly-x/stress-split-erasure-code/5-mon/mona.yaml b/suites/upgrade/firefly-x/stress-split-erasure-code/5-mon/mona.yaml new file mode 100644 index 0000000000000..b6ffb3323d11e --- /dev/null +++ b/suites/upgrade/firefly-x/stress-split-erasure-code/5-mon/mona.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/firefly-x/stress-split-erasure-code/6-next-mon b/suites/upgrade/firefly-x/stress-split-erasure-code/6-next-mon deleted file mode 120000 index 0f00e43e5fd6f..0000000000000 --- a/suites/upgrade/firefly-x/stress-split-erasure-code/6-next-mon +++ /dev/null @@ -1 +0,0 @@ -../stress-split/6-next-mon \ No newline at end of file diff --git a/suites/upgrade/firefly-x/stress-split-erasure-code/5-workload/ec-rados-default.yaml b/suites/upgrade/firefly-x/stress-split-erasure-code/6-workload/ec-rados-default.yaml similarity index 100% rename from suites/upgrade/firefly-x/stress-split-erasure-code/5-workload/ec-rados-default.yaml rename to suites/upgrade/firefly-x/stress-split-erasure-code/6-workload/ec-rados-default.yaml diff --git a/suites/upgrade/firefly-x/stress-split-erasure-code/7-next-mon/monb.yaml b/suites/upgrade/firefly-x/stress-split-erasure-code/7-next-mon/monb.yaml new file mode 100644 index 0000000000000..513890c41c015 --- /dev/null +++ b/suites/upgrade/firefly-x/stress-split-erasure-code/7-next-mon/monb.yaml @@ -0,0 +1,5 @@ +tasks: +- ceph.restart: + daemons: [mon.b] + wait-for-healthy: false + wait-for-osds-up: true diff --git a/suites/upgrade/firefly-x/stress-split-erasure-code/8-next-mon b/suites/upgrade/firefly-x/stress-split-erasure-code/8-next-mon deleted file mode 120000 index 726c6a47a2e47..0000000000000 --- a/suites/upgrade/firefly-x/stress-split-erasure-code/8-next-mon +++ /dev/null @@ -1 +0,0 @@ -../stress-split/8-next-mon \ No newline at end of file diff --git a/suites/upgrade/firefly-x/stress-split-erasure-code/8-next-mon/monc.yaml b/suites/upgrade/firefly-x/stress-split-erasure-code/8-next-mon/monc.yaml new file mode 100644 index 0000000000000..e9273236ba331 --- /dev/null +++ b/suites/upgrade/firefly-x/stress-split-erasure-code/8-next-mon/monc.yaml @@ -0,0 +1,6 @@ +tasks: +- ceph.restart: + daemons: [mon.c] + wait-for-healthy: false + wait-for-osds-up: true +- ceph.wait_for_mon_quorum: [a, b, c] diff --git a/suites/upgrade/firefly-x/stress-split-erasure-code/distros b/suites/upgrade/firefly-x/stress-split-erasure-code/distros index 8d4309788e01e..79010c36a5998 120000 --- a/suites/upgrade/firefly-x/stress-split-erasure-code/distros +++ b/suites/upgrade/firefly-x/stress-split-erasure-code/distros @@ -1 +1 @@ -../stress-split/distros \ No newline at end of file +../../../../distros/supported \ No newline at end of file -- 2.39.5