From: Loic Dachary <ldachary@redhat.com>
Date: Tue, 24 Mar 2015 19:12:56 +0000 (+0100)
Subject: erasure-code: rename firefly-x/stress-split-erasure-code
X-Git-Tag: v10.2.6~165^2^2~510^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=12af9b7292058a9dd8a8c71da0653dcf3400e762;p=ceph.git

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 <loic@dachary.org>
---

diff --git a/suites/upgrade/firefly-x/parallel-erasure-code/% b/suites/upgrade/firefly-x/parallel-erasure-code/%
new file mode 100644
index 000000000000..e69de29bb2d1
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 000000000000..877aba862bbd
--- /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 000000000000..d569e006c7e7
--- /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 000000000000..ab64a5fc02fb
--- /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 000000000000..4f8f10f5c6fe
--- /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 000000000000..ecffa88e4987
--- /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 6dceffa2f5b6..000000000000
--- 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 000000000000..9ea0a27f82a2
--- /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 fad6450f52d1..000000000000
--- 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 000000000000..a3573817aa0a
--- /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 c3a4e2c28e59..000000000000
--- 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 000000000000..43526c48b6bc
--- /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/3-thrash/default.yaml b/suites/upgrade/firefly-x/stress-split-erasure-code/3-thrash/default.yaml
deleted file mode 100644
index f41b9be4b025..000000000000
--- a/suites/upgrade/firefly-x/stress-split-erasure-code/3-thrash/default.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-overrides:
-  ceph:
-    log-whitelist:
-    - wrongly marked me down
-    - objects unfound and apparently lost
-    - log bound mismatch
-tasks:
-- thrashosds:
-    timeout: 1200
-    chance_pgnum_grow: 1
-    chance_pgpnum_fix: 1
-    min_in: 4
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 0ea7dd5aa8d5..000000000000
--- 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/4-thrash/default.yaml b/suites/upgrade/firefly-x/stress-split-erasure-code/4-thrash/default.yaml
new file mode 100644
index 000000000000..f41b9be4b025
--- /dev/null
+++ b/suites/upgrade/firefly-x/stress-split-erasure-code/4-thrash/default.yaml
@@ -0,0 +1,12 @@
+overrides:
+  ceph:
+    log-whitelist:
+    - wrongly marked me down
+    - objects unfound and apparently lost
+    - log bound mismatch
+tasks:
+- thrashosds:
+    timeout: 1200
+    chance_pgnum_grow: 1
+    chance_pgpnum_fix: 1
+    min_in: 4
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 000000000000..b6ffb3323d11
--- /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/5-workload/ec-rados-default.yaml b/suites/upgrade/firefly-x/stress-split-erasure-code/5-workload/ec-rados-default.yaml
deleted file mode 120000
index a8a0ae69405a..000000000000
--- a/suites/upgrade/firefly-x/stress-split-erasure-code/5-workload/ec-rados-default.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../erasure-code/ec-rados-default.yaml
\ No newline at end of file
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 0f00e43e5fd6..000000000000
--- 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/6-workload/ec-rados-default.yaml b/suites/upgrade/firefly-x/stress-split-erasure-code/6-workload/ec-rados-default.yaml
new file mode 120000
index 000000000000..a8a0ae69405a
--- /dev/null
+++ b/suites/upgrade/firefly-x/stress-split-erasure-code/6-workload/ec-rados-default.yaml
@@ -0,0 +1 @@
+../../../../../erasure-code/ec-rados-default.yaml
\ No newline at end of file
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 000000000000..513890c41c01
--- /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 726c6a47a2e4..000000000000
--- 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 000000000000..e9273236ba33
--- /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 8d4309788e01..79010c36a599 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