upgrade-cuttlefish: test upgrades to new point releases

This only covers rados tests currently.  We should expand this to include rgw,
rbd, and cephfs workloads.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/suites/upgrade-cuttlefish/rados-older/0-cluster/start.yaml b/suites/upgrade-cuttlefish/rados-older/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..c8ca864
--- /dev/null
+++ b/suites/upgrade-cuttlefish/rados-older/0-cluster/start.yaml
@@ -0,0 +1,19 @@
+overrides:
+  ceph:
+    log-whitelist:
+    - scrub
+    conf:
+      paxos service trim min: 5
+      mon min osdmap epochs: 25
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+  - osd.2
+- - mon.b
+  - mon.c
+  - osd.3
+  - osd.4
+  - osd.5
+  - client.0

diff --git a/suites/upgrade-cuttlefish/rados-older/1-install/bobtail.yaml b/suites/upgrade-cuttlefish/rados-older/1-install/bobtail.yaml
new file mode 100644 (file)
index 0000000..21dc2bb
--- /dev/null
+++ b/suites/upgrade-cuttlefish/rados-older/1-install/bobtail.yaml
@@ -0,0 +1,4 @@
+tasks:
+- install:
+    branch: bobtail
+- ceph:

diff --git a/suites/upgrade-cuttlefish/rados-older/1-install/v0.61.1.yaml b/suites/upgrade-cuttlefish/rados-older/1-install/v0.61.1.yaml
new file mode 100644 (file)
index 0000000..c77ab27
--- /dev/null
+++ b/suites/upgrade-cuttlefish/rados-older/1-install/v0.61.1.yaml
@@ -0,0 +1,4 @@
+tasks:
+- install:
+    tag: v0.61.1
+- ceph:

diff --git a/suites/upgrade-cuttlefish/rados-older/2-upgrade/v0.61.3.yaml b/suites/upgrade-cuttlefish/rados-older/2-upgrade/v0.61.3.yaml
new file mode 100644 (file)
index 0000000..aca276b
--- /dev/null
+++ b/suites/upgrade-cuttlefish/rados-older/2-upgrade/v0.61.3.yaml
@@ -0,0 +1,5 @@
+tasks:
+- install.upgrade:
+    all:
+      tag: v0.61.3
+- ceph.restart:

diff --git a/suites/upgrade-cuttlefish/rados-older/2-upgrade/v0.61.4.yaml b/suites/upgrade-cuttlefish/rados-older/2-upgrade/v0.61.4.yaml
new file mode 100644 (file)
index 0000000..c44994e
--- /dev/null
+++ b/suites/upgrade-cuttlefish/rados-older/2-upgrade/v0.61.4.yaml
@@ -0,0 +1,5 @@
+tasks:
+- install.upgrade:
+    all:
+      tag: v0.61.4
+- ceph.restart:

diff --git a/suites/upgrade-cuttlefish/rados-older/2-upgrade/v0.61.5.yaml b/suites/upgrade-cuttlefish/rados-older/2-upgrade/v0.61.5.yaml
new file mode 100644 (file)
index 0000000..d46a1a1
--- /dev/null
+++ b/suites/upgrade-cuttlefish/rados-older/2-upgrade/v0.61.5.yaml
@@ -0,0 +1,5 @@
+tasks:
+- install.upgrade:
+    all:
+      tag: v0.61.5
+- ceph.restart:

diff --git a/suites/upgrade-cuttlefish/rados-older/3-rolling-upgrade/all.yaml b/suites/upgrade-cuttlefish/rados-older/3-rolling-upgrade/all.yaml
new file mode 100644 (file)
index 0000000..fe89235
--- /dev/null
+++ b/suites/upgrade-cuttlefish/rados-older/3-rolling-upgrade/all.yaml
@@ -0,0 +1,4 @@
+tasks:
+- parallel:
+   - workload
+   - upgrade-sequence

diff --git a/suites/upgrade-cuttlefish/rados-older/4-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade-cuttlefish/rados-older/4-upgrade-sequence/upgrade-mds-mon-osd.yaml
new file mode 100644 (file)
index 0000000..e70e5d0
--- /dev/null
+++ b/suites/upgrade-cuttlefish/rados-older/4-upgrade-sequence/upgrade-mds-mon-osd.yaml
@@ -0,0 +1,39 @@
+upgrade-sequence:
+   sequential:
+   - install.upgrade:
+      all:
+         branch: cuttlefish
+   - ceph.restart: [mds.a]
+   - sleep:
+       duration: 60
+   - ceph.restart:
+       daemons: [mon.a]
+       wait-for-healthy: false
+       wait-for-osds-up: true
+   - sleep:
+       duration: 60
+   - ceph.restart:
+       daemons: [mon.b]
+       wait-for-healthy: false
+       wait-for-osds-up: true
+   - sleep:
+       duration: 60
+   - ceph.restart: [mon.c]
+   - sleep:
+       duration: 60
+   - ceph.restart: [osd.0]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.1]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.2]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.3]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.4]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.5]

diff --git a/suites/upgrade-cuttlefish/rados-older/4-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade-cuttlefish/rados-older/4-upgrade-sequence/upgrade-mon-osd-mds.yaml
new file mode 100644 (file)
index 0000000..ed25b70
--- /dev/null
+++ b/suites/upgrade-cuttlefish/rados-older/4-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -0,0 +1,39 @@
+upgrade-sequence:
+   sequential:
+   - install.upgrade:
+      all:
+         branch: cuttlefish
+   - ceph.restart:
+       daemons: [mon.a]
+       wait-for-healthy: false
+       wait-for-osds-up: true
+   - sleep:
+       duration: 60
+   - ceph.restart:
+       daemons: [mon.b]
+       wait-for-healthy: false
+       wait-for-osds-up: true
+   - sleep:
+       duration: 60
+   - ceph.restart: [mon.c]
+   - sleep:
+       duration: 60
+   - ceph.restart: [mds.a]
+   - sleep:
+       duration: 60
+   - ceph.restart: [osd.0]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.1]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.2]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.3]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.4]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.5]

diff --git a/suites/upgrade-cuttlefish/rados-older/4-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade-cuttlefish/rados-older/4-upgrade-sequence/upgrade-osd-mon-mds.yaml
new file mode 100644 (file)
index 0000000..33368cd
--- /dev/null
+++ b/suites/upgrade-cuttlefish/rados-older/4-upgrade-sequence/upgrade-osd-mon-mds.yaml
@@ -0,0 +1,41 @@
+upgrade-sequence:
+   sequential:
+   - install.upgrade:
+      all:
+         branch: cuttlefish
+   - ceph.restart: [osd.0]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.1]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.2]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.3]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.4]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.5]
+   - sleep:
+       duration: 60
+   - ceph.restart:
+       daemons: [mon.a]
+       wait-for-healthy: false
+       wait-for-osds-up: true
+   - sleep:
+       duration: 60
+   - ceph.restart:
+       daemons: [mon.b]
+       wait-for-healthy: false
+       wait-for-osds-up: true
+   - sleep:
+       duration: 60
+   - ceph.restart: [mon.c]
+   - sleep:
+       duration: 60
+   - ceph.restart: [mds.a]
+   - sleep:
+       duration: 60

diff --git a/suites/upgrade-cuttlefish/rados-older/5-workload/testrados.yaml b/suites/upgrade-cuttlefish/rados-older/5-workload/testrados.yaml
new file mode 100644 (file)
index 0000000..8eaab19
--- /dev/null
+++ b/suites/upgrade-cuttlefish/rados-older/5-workload/testrados.yaml
@@ -0,0 +1,13 @@
+workload:
+  rados:
+    clients: [client.0]
+    ops: 2000
+    objects: 50
+    op_weights:
+      read: 100
+      write: 100
+      delete: 50
+      snap_create: 50
+      snap_remove: 50
+      rollback: 50
+

diff --git a/suites/upgrade-cuttlefish/rados-older/6-final/monthrash.yaml b/suites/upgrade-cuttlefish/rados-older/6-final/monthrash.yaml
new file mode 100644 (file)
index 0000000..810ba1b
--- /dev/null
+++ b/suites/upgrade-cuttlefish/rados-older/6-final/monthrash.yaml
@@ -0,0 +1,9 @@
+tasks:
+- mon_thrash:
+    revive_delay: 20
+    thrash_delay: 1
+- workunit:
+    clients:
+      client.0:
+        - rados/test.sh
+

diff --git a/suites/upgrade-cuttlefish/rados-older/6-final/osdthrash.yaml b/suites/upgrade-cuttlefish/rados-older/6-final/osdthrash.yaml
new file mode 100644 (file)
index 0000000..ef1bb9c
--- /dev/null
+++ b/suites/upgrade-cuttlefish/rados-older/6-final/osdthrash.yaml
@@ -0,0 +1,22 @@
+overrides:
+  ceph:
+    log-whitelist:
+    - wrongly marked me down
+    - objects unfound and apparently lost
+tasks:
+- thrashosds:
+    timeout: 1200
+    chance_pgnum_grow: 1
+    chance_pgpnum_fix: 1
+- rados:
+    clients: [client.0]
+    ops: 2000
+    objects: 50
+    op_weights:
+      read: 100
+      write: 100
+      delete: 50
+      snap_create: 50
+      snap_remove: 50
+      rollback: 50
+

diff --git a/suites/upgrade-cuttlefish/rados/0-cluster/start.yaml b/suites/upgrade-cuttlefish/rados/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..ff7bd79
--- /dev/null
+++ b/suites/upgrade-cuttlefish/rados/0-cluster/start.yaml
@@ -0,0 +1,16 @@
+overrides:
+  ceph:
+    log-whitelist:
+    - scrub
+roles:
+- - mon.a
+  - mds.a
+  - osd.0
+  - osd.1
+  - osd.2
+- - mon.b
+  - mon.c
+  - osd.3
+  - osd.4
+  - osd.5
+  - client.0

diff --git a/suites/upgrade-cuttlefish/rados/1-cuttlefish-install/bobtail.v0.61.5.yaml b/suites/upgrade-cuttlefish/rados/1-cuttlefish-install/bobtail.v0.61.5.yaml
new file mode 100644 (file)
index 0000000..286cdd6
--- /dev/null
+++ b/suites/upgrade-cuttlefish/rados/1-cuttlefish-install/bobtail.v0.61.5.yaml
@@ -0,0 +1,11 @@
+tasks:
+- install:
+    branch: bobtail
+- ceph:
+- install.upgrade:
+    all:
+      tag: v0.61.5
+- ceph.restart:
+- parallel:
+   - workload
+   - upgrade-sequence

diff --git a/suites/upgrade-cuttlefish/rados/1-cuttlefish-install/v0.61.5.yaml b/suites/upgrade-cuttlefish/rados/1-cuttlefish-install/v0.61.5.yaml
new file mode 100644 (file)
index 0000000..07d0431
--- /dev/null
+++ b/suites/upgrade-cuttlefish/rados/1-cuttlefish-install/v0.61.5.yaml
@@ -0,0 +1,7 @@
+tasks:
+- install:
+    tag: v0.61.5
+- ceph:
+- parallel:
+   - workload
+   - upgrade-sequence

diff --git a/suites/upgrade-cuttlefish/rados/1-cuttlefish-install/v0.61.6.yaml b/suites/upgrade-cuttlefish/rados/1-cuttlefish-install/v0.61.6.yaml
new file mode 100644 (file)
index 0000000..9d74ab3
--- /dev/null
+++ b/suites/upgrade-cuttlefish/rados/1-cuttlefish-install/v0.61.6.yaml
@@ -0,0 +1,7 @@
+tasks:
+- install:
+    tag: v0.61.6
+- ceph:
+- parallel:
+   - workload
+   - upgrade-sequence

diff --git a/suites/upgrade-cuttlefish/rados/2-workload/testrados.yaml b/suites/upgrade-cuttlefish/rados/2-workload/testrados.yaml
new file mode 100644 (file)
index 0000000..8eaab19
--- /dev/null
+++ b/suites/upgrade-cuttlefish/rados/2-workload/testrados.yaml
@@ -0,0 +1,13 @@
+workload:
+  rados:
+    clients: [client.0]
+    ops: 2000
+    objects: 50
+    op_weights:
+      read: 100
+      write: 100
+      delete: 50
+      snap_create: 50
+      snap_remove: 50
+      rollback: 50
+

diff --git a/suites/upgrade-cuttlefish/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade-cuttlefish/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
new file mode 100644 (file)
index 0000000..c97aef7
--- /dev/null
+++ b/suites/upgrade-cuttlefish/rados/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
@@ -0,0 +1,33 @@
+upgrade-sequence:
+   sequential:
+   - install.upgrade:
+      all:
+         branch: cuttlefish
+   - ceph.restart: [mds.a]
+   - sleep:
+       duration: 60
+   - ceph.restart: [mon.a]
+   - sleep:
+       duration: 60
+   - ceph.restart: [mon.b]
+   - sleep:
+       duration: 60
+   - ceph.restart: [mon.c]
+   - sleep:
+       duration: 60
+   - ceph.restart: [osd.0]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.1]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.2]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.3]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.4]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.5]

diff --git a/suites/upgrade-cuttlefish/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade-cuttlefish/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
new file mode 100644 (file)
index 0000000..9d06ef3
--- /dev/null
+++ b/suites/upgrade-cuttlefish/rados/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -0,0 +1,33 @@
+upgrade-sequence:
+   sequential:
+   - install.upgrade:
+      all:
+         branch: cuttlefish
+   - ceph.restart: [mon.a]
+   - sleep:
+       duration: 60
+   - ceph.restart: [mon.b]
+   - sleep:
+       duration: 60
+   - ceph.restart: [mon.c]
+   - sleep:
+       duration: 60
+   - ceph.restart: [mds.a]
+   - sleep:
+       duration: 60
+   - ceph.restart: [osd.0]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.1]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.2]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.3]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.4]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.5]

diff --git a/suites/upgrade-cuttlefish/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade-cuttlefish/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
new file mode 100644 (file)
index 0000000..c061399
--- /dev/null
+++ b/suites/upgrade-cuttlefish/rados/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
@@ -0,0 +1,35 @@
+upgrade-sequence:
+   sequential:
+   - install.upgrade:
+      all:
+         branch: cuttlefish
+   - ceph.restart: [osd.0]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.1]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.2]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.3]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.4]
+   - sleep:
+       duration: 30
+   - ceph.restart: [osd.5]
+   - sleep:
+       duration: 60
+   - ceph.restart: [mon.a]
+   - sleep:
+       duration: 60
+   - ceph.restart: [mon.b]
+   - sleep:
+       duration: 60
+   - ceph.restart: [mon.c]
+   - sleep:
+       duration: 60
+   - ceph.restart: [mds.a]
+   - sleep:
+       duration: 60

diff --git a/suites/upgrade-cuttlefish/rados/4-final/monthrash.yaml b/suites/upgrade-cuttlefish/rados/4-final/monthrash.yaml
new file mode 100644 (file)
index 0000000..810ba1b
--- /dev/null
+++ b/suites/upgrade-cuttlefish/rados/4-final/monthrash.yaml
@@ -0,0 +1,9 @@
+tasks:
+- mon_thrash:
+    revive_delay: 20
+    thrash_delay: 1
+- workunit:
+    clients:
+      client.0:
+        - rados/test.sh
+

diff --git a/suites/upgrade-cuttlefish/rados/4-final/osdthrash.yaml b/suites/upgrade-cuttlefish/rados/4-final/osdthrash.yaml
new file mode 100644 (file)
index 0000000..ef1bb9c
--- /dev/null
+++ b/suites/upgrade-cuttlefish/rados/4-final/osdthrash.yaml
@@ -0,0 +1,22 @@
+overrides:
+  ceph:
+    log-whitelist:
+    - wrongly marked me down
+    - objects unfound and apparently lost
+tasks:
+- thrashosds:
+    timeout: 1200
+    chance_pgnum_grow: 1
+    chance_pgpnum_fix: 1
+- rados:
+    clients: [client.0]
+    ops: 2000
+    objects: 50
+    op_weights:
+      read: 100
+      write: 100
+      delete: 50
+      snap_create: 50
+      snap_remove: 50
+      rollback: 50
+