Added jewel-x-singleton

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>

diff --git a/suites/rados/upgrade/% b/suites/rados/upgrade/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/rados/upgrade/jewel-x-singleton/% b/suites/rados/upgrade/jewel-x-singleton/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/rados/upgrade/jewel-x-singleton/0-cluster/+ b/suites/rados/upgrade/jewel-x-singleton/0-cluster/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/rados/upgrade/jewel-x-singleton/0-cluster/openstack.yaml b/suites/rados/upgrade/jewel-x-singleton/0-cluster/openstack.yaml
new file mode 100644 (file)
index 0000000..a0d5c20
--- /dev/null
+++ b/suites/rados/upgrade/jewel-x-singleton/0-cluster/openstack.yaml
@@ -0,0 +1,6 @@
+openstack:
+  - machine:
+      disk: 100 # GB
+  - volumes: # attached to each instance
+      count: 3
+      size: 30 # GB

diff --git a/suites/rados/upgrade/jewel-x-singleton/0-cluster/start.yaml b/suites/rados/upgrade/jewel-x-singleton/0-cluster/start.yaml
new file mode 100644 (file)
index 0000000..fd200d7
--- /dev/null
+++ b/suites/rados/upgrade/jewel-x-singleton/0-cluster/start.yaml
@@ -0,0 +1,23 @@
+meta:
+- desc: |
+   Run ceph on two nodes,
+   with a separate client-only node. 
+   Use xfs beneath the osds.
+overrides:
+  ceph:
+    conf:
+      mon:
+        mon warn on legacy crush tunables: false
+    fs: xfs
+roles:
+- - mon.a
+  - mon.b
+  - mon.c
+  - mds.a
+  - osd.0
+  - osd.1
+  - osd.2
+- - osd.3
+  - osd.4
+  - osd.5
+- - client.0

diff --git a/suites/rados/upgrade/jewel-x-singleton/1-jewel-install/jewel.yaml b/suites/rados/upgrade/jewel-x-singleton/1-jewel-install/jewel.yaml
new file mode 100644 (file)
index 0000000..590e1e3
--- /dev/null
+++ b/suites/rados/upgrade/jewel-x-singleton/1-jewel-install/jewel.yaml
@@ -0,0 +1,8 @@
+meta:
+- desc: install ceph/jewel latest
+tasks:
+- install:
+    branch: jewel
+- print: "**** done install jewel"
+- ceph:
+- print: "**** done ceph"

diff --git a/suites/rados/upgrade/jewel-x-singleton/2-partial-upgrade/firsthalf.yaml b/suites/rados/upgrade/jewel-x-singleton/2-partial-upgrade/firsthalf.yaml
new file mode 100644 (file)
index 0000000..ab5dcac
--- /dev/null
+++ b/suites/rados/upgrade/jewel-x-singleton/2-partial-upgrade/firsthalf.yaml
@@ -0,0 +1,12 @@
+meta:
+- desc: |
+   install upgrade ceph/-x on one node only
+   1st half
+   restart : osd.0,1,2,3,4,5
+tasks:
+- install.upgrade:
+    osd.0: 
+- print: "**** done install.upgrade osd.0"
+- ceph.restart:
+    daemons: [osd.0, osd.1, osd.2, osd.3, osd.4, osd.5]
+- print: "**** done ceph.restart 1st half"

diff --git a/suites/rados/upgrade/jewel-x-singleton/3-thrash/default.yaml b/suites/rados/upgrade/jewel-x-singleton/3-thrash/default.yaml
new file mode 100644 (file)
index 0000000..a600a16
--- /dev/null
+++ b/suites/rados/upgrade/jewel-x-singleton/3-thrash/default.yaml
@@ -0,0 +1,16 @@
+meta:
+- desc: |
+   randomly kill and revive osd
+   small chance to increase the number of pgs
+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
+- print: "**** done thrashosds 3-thrash"

diff --git a/suites/rados/upgrade/jewel-x-singleton/4-mon/mona.yaml b/suites/rados/upgrade/jewel-x-singleton/4-mon/mona.yaml
new file mode 100644 (file)
index 0000000..e3c369d
--- /dev/null
+++ b/suites/rados/upgrade/jewel-x-singleton/4-mon/mona.yaml
@@ -0,0 +1,9 @@
+meta:
+- desc: |
+   restart mon.a so it is upgraded to -x
+tasks:
+- ceph.restart:
+    daemons: [mon.a]
+    wait-for-healthy: false
+    wait-for-osds-up: true
+- print: "**** done ceph.restart mon.a"

diff --git a/suites/rados/upgrade/jewel-x-singleton/5-workload/+ b/suites/rados/upgrade/jewel-x-singleton/5-workload/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd-cls.yaml b/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd-cls.yaml
new file mode 100644 (file)
index 0000000..84827e4
--- /dev/null
+++ b/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd-cls.yaml
@@ -0,0 +1,10 @@
+meta:
+- desc: |
+   run basic cls tests for rbd
+tasks:
+- workunit:
+    branch: jewel
+    clients:
+      client.0:
+        - cls/test_cls_rbd.sh
+- print: "**** done cls/test_cls_rbd.sh 5-workload"

diff --git a/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd-import-export.yaml b/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd-import-export.yaml
new file mode 100644 (file)
index 0000000..dd3d25f
--- /dev/null
+++ b/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd-import-export.yaml
@@ -0,0 +1,12 @@
+meta:
+- desc: |
+   run basic import/export cli tests for rbd
+tasks:
+- workunit:
+    branch: jewel
+    clients:
+      client.0:
+        - rbd/import_export.sh
+    env:
+      RBD_CREATE_ARGS: --new-format
+- print: "**** done rbd/import_export.sh 5-workload"

diff --git a/suites/rados/upgrade/jewel-x-singleton/5-workload/readwrite.yaml b/suites/rados/upgrade/jewel-x-singleton/5-workload/readwrite.yaml
new file mode 100644 (file)
index 0000000..1b161b4
--- /dev/null
+++ b/suites/rados/upgrade/jewel-x-singleton/5-workload/readwrite.yaml
@@ -0,0 +1,16 @@
+meta:
+- desc: |
+   randomized correctness test for rados operations on a replicated pool, 
+   using only reads, writes, and deletes
+tasks:
+- full_sequential:
+  - rados:
+      clients: [client.0]
+      ops: 4000
+      objects: 500
+      write_append_excl: false
+      op_weights:
+        read: 45
+        write: 45
+        delete: 10
+- print: "**** done rados/readwrite 5-workload"

diff --git a/suites/rados/upgrade/jewel-x-singleton/5-workload/snaps-few-objects.yaml b/suites/rados/upgrade/jewel-x-singleton/5-workload/snaps-few-objects.yaml
new file mode 100644 (file)
index 0000000..71445bd
--- /dev/null
+++ b/suites/rados/upgrade/jewel-x-singleton/5-workload/snaps-few-objects.yaml
@@ -0,0 +1,18 @@
+meta:
+- desc: |
+   randomized correctness test for rados operations on a replicated pool with snapshot operations
+tasks:
+- full_sequential:
+  - rados:
+      clients: [client.0]
+      ops: 4000
+      objects: 50
+      write_append_excl: false
+      op_weights:
+        read: 100
+        write: 100
+        delete: 50
+        snap_create: 50
+        snap_remove: 50
+        rollback: 50
+- print: "**** done rados/snaps-few-objects 5-workload"

diff --git a/suites/rados/upgrade/jewel-x-singleton/6-next-mon/monb.yaml b/suites/rados/upgrade/jewel-x-singleton/6-next-mon/monb.yaml
new file mode 100644 (file)
index 0000000..ba71c73
--- /dev/null
+++ b/suites/rados/upgrade/jewel-x-singleton/6-next-mon/monb.yaml
@@ -0,0 +1,9 @@
+meta:
+- desc: |
+   restart mon.b so it is upgraded to -x
+tasks:
+- ceph.restart:
+    daemons: [mon.b]
+    wait-for-healthy: false
+    wait-for-osds-up: true
+- print: "**** done ceph.restart mon.b 6-next-mon"

diff --git a/suites/rados/upgrade/jewel-x-singleton/7-workload/+ b/suites/rados/upgrade/jewel-x-singleton/7-workload/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/rados/upgrade/jewel-x-singleton/7-workload/radosbench.yaml b/suites/rados/upgrade/jewel-x-singleton/7-workload/radosbench.yaml
new file mode 100644 (file)
index 0000000..7d2be5f
--- /dev/null
+++ b/suites/rados/upgrade/jewel-x-singleton/7-workload/radosbench.yaml
@@ -0,0 +1,40 @@
+meta:
+- desc: |
+   run randomized correctness test for rados operations
+   generate write load with rados bench
+tasks:
+- full_sequential:
+  - radosbench:
+      clients: [client.0]
+      time: 150
+  - radosbench:
+      clients: [client.0]
+      time: 150
+  - radosbench:
+      clients: [client.0]
+      time: 150
+  - radosbench:
+      clients: [client.0]
+      time: 150
+  - radosbench:
+      clients: [client.0]
+      time: 150
+  - radosbench:
+      clients: [client.0]
+      time: 150
+  - radosbench:
+      clients: [client.0]
+      time: 150
+  - radosbench:
+      clients: [client.0]
+      time: 150
+  - radosbench:
+      clients: [client.0]
+      time: 150
+  - radosbench:
+      clients: [client.0]
+      time: 150
+  - radosbench:
+      clients: [client.0]
+      time: 150
+- print: "**** done radosbench 7-workload"

diff --git a/suites/rados/upgrade/jewel-x-singleton/7-workload/rbd_api.yaml b/suites/rados/upgrade/jewel-x-singleton/7-workload/rbd_api.yaml
new file mode 100644 (file)
index 0000000..81067e6
--- /dev/null
+++ b/suites/rados/upgrade/jewel-x-singleton/7-workload/rbd_api.yaml
@@ -0,0 +1,10 @@
+meta:
+- desc: |
+   librbd C and C++ api tests
+tasks:
+- workunit:
+     branch: jewel
+     clients:
+        client.0:
+           - rbd/test_librbd.sh
+- print: "**** done rbd/test_librbd.sh 7-workload"

diff --git a/suites/rados/upgrade/jewel-x-singleton/8-next-mon/monc.yaml b/suites/rados/upgrade/jewel-x-singleton/8-next-mon/monc.yaml
new file mode 100644 (file)
index 0000000..12788b7
--- /dev/null
+++ b/suites/rados/upgrade/jewel-x-singleton/8-next-mon/monc.yaml
@@ -0,0 +1,12 @@
+meta:
+- desc: |
+   restart mon.c so it is upgraded to -x
+   as all mon were upgrated, expected ceph cluster reach quorum
+tasks:
+- ceph.restart:
+    daemons: [mon.c]
+    wait-for-healthy: false
+    wait-for-osds-up: true
+- print: "**** done ceph.restart mon.c 8-next-mon"
+- ceph.wait_for_mon_quorum: [a, b, c]
+- print: "**** done wait_for_mon_quorum 8-next-mon"

diff --git a/suites/rados/upgrade/jewel-x-singleton/9-workload/+ b/suites/rados/upgrade/jewel-x-singleton/9-workload/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/rados/upgrade/jewel-x-singleton/9-workload/rbd-python.yaml b/suites/rados/upgrade/jewel-x-singleton/9-workload/rbd-python.yaml
new file mode 100644 (file)
index 0000000..8da3457
--- /dev/null
+++ b/suites/rados/upgrade/jewel-x-singleton/9-workload/rbd-python.yaml
@@ -0,0 +1,10 @@
+meta:
+- desc: |
+   librbd python api tests
+tasks:
+- workunit:
+    branch: jewel
+    clients:
+      client.0:
+        - rbd/test_librbd_python.sh
+- print: "**** done rbd/test_librbd_python.sh 9-workload"

diff --git a/suites/rados/upgrade/jewel-x-singleton/9-workload/rgw-swift.yaml b/suites/rados/upgrade/jewel-x-singleton/9-workload/rgw-swift.yaml
new file mode 100644 (file)
index 0000000..ba004ce
--- /dev/null
+++ b/suites/rados/upgrade/jewel-x-singleton/9-workload/rgw-swift.yaml
@@ -0,0 +1,12 @@
+meta:
+- desc: |
+   swift api tests for rgw
+tasks:
+- rgw: 
+    client.0:
+    default_idle_timeout: 300
+- print: "**** done rgw 9-workload"
+- swift:
+    client.0:
+      rgw_server: client.0
+- print: "**** done swift 9-workload"

diff --git a/suites/rados/upgrade/jewel-x-singleton/9-workload/snaps-many-objects.yaml b/suites/rados/upgrade/jewel-x-singleton/9-workload/snaps-many-objects.yaml
new file mode 100644 (file)
index 0000000..805bf97
--- /dev/null
+++ b/suites/rados/upgrade/jewel-x-singleton/9-workload/snaps-many-objects.yaml
@@ -0,0 +1,16 @@
+meta:
+- desc: |
+   randomized correctness test for rados operations on a replicated pool with snapshot operations
+tasks:
+- rados:
+    clients: [client.0]
+    ops: 4000
+    objects: 500
+    write_append_excl: false
+    op_weights:
+      read: 100
+      write: 100
+      delete: 50
+      snap_create: 50
+      snap_remove: 50
+      rollback: 50

diff --git a/suites/rados/upgrade/rados.yaml b/suites/rados/upgrade/rados.yaml
deleted file mode 120000 (symlink)
index b756e57..0000000
--- a/suites/rados/upgrade/rados.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../config/rados.yaml
\ No newline at end of file