qa/suites/upgrade/luminous-x/parallel: mon per host, msgr2

- mon per host
- enable msgr2 at the end
- include the nautilus.yaml

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

diff --git a/qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml b/qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml
index 6f124d61474a2b188d4f19926c3f4cda45d6ce48..5b20ff5505272ef03001a94bd5dd1fddfd4d6c95 100644 (file)
--- a/qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml
+++ b/qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml
@@ -10,10 +10,18 @@ roles:
   - mds.a
   - osd.0
   - osd.1
-- - mon.b
-  - mon.c
   - osd.2
   - osd.3
+- - mon.b
+  - osd.4
+  - osd.5
+  - osd.6
+  - osd.7
+- - mon.c
+  - osd.8
+  - osd.9
+  - osd.10
+  - osd.11
 - - client.0
   - client.1
   - client.2
@@ -30,6 +38,7 @@ overrides:
     - \(SLOW_OPS\)
     - overall HEALTH_
     - slow request
+    - \(MON_MSGR2_NOT_ENABLED\)
     conf:
       global:
         enable experimental unrecoverable data corrupting features: "*"

diff --git a/qa/suites/upgrade/luminous-x/parallel/1-ceph-install/luminous.yaml b/qa/suites/upgrade/luminous-x/parallel/1-ceph-install/luminous.yaml
index 3672828b74317932766328c73fcd8473a7ea59fe..865fa5170635a9e6635f01c70d7034cf245d1b53 100644 (file)
--- a/qa/suites/upgrade/luminous-x/parallel/1-ceph-install/luminous.yaml
+++ b/qa/suites/upgrade/luminous-x/parallel/1-ceph-install/luminous.yaml
@@ -39,7 +39,8 @@ tasks:
 - install.upgrade:
     mon.a:
     mon.b:
-- print: "**** done install.upgrade both hosts"
+    mon.c:
+- print: "**** done install.upgrade non-client hosts"
 - parallel:
     - workload
     - upgrade-sequence

diff --git a/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-all.yaml
index 5c021bdf130743dc919759e1509b935a9f0991d7..7fb9829a4a9225802d5a22c5494e1b6128cf161a 100644 (file)
--- a/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-all.yaml
+++ b/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-all.yaml
@@ -6,8 +6,13 @@ upgrade-sequence:
    - ceph.restart:
        daemons: [mon.a, mon.b, mon.c, mgr.x]
        mon-health-to-clog: false
+       wait-for-healthy: false
+   - exec:
+       mon.a:
+         - ceph config set global mon_warn_on_msgr2_not_enabled false
+   - ceph.healthy:
    - ceph.restart:
-       daemons: [osd.0, osd.1, osd.2, osd.3]
+       daemons: [osd.0, osd.1, osd.2, osd.3, osd.4, osd.5, osd.6, osd.7, osd.8, osd.9, osd.10, osd.11]
        wait-for-healthy: false
        wait-for-osds-up: true
    - ceph.restart:

diff --git a/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
index 46a1345fb15400df3009deb178f1da977bf54330..4f9aac75436e366957cd1196c90805b0ae1d3c4a 100644 (file)
--- a/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ b/qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -13,13 +13,23 @@ upgrade-sequence:
    - sleep:
        duration: 60
    - ceph.restart:
-       daemons: [mon.b, mon.c, mgr.x]
+       daemons: [mon.b, mgr.x]
        wait-for-healthy: true
        mon-health-to-clog: false
    - sleep:
        duration: 60
    - ceph.restart:
-       daemons: [osd.0, osd.1]
+       daemons: [mon.c]
+       wait-for-healthy: false
+       mon-health-to-clog: false
+   - exec:
+       mon.a:
+         - ceph config set global mon_warn_on_msgr2_not_enabled false
+   - ceph.healthy:
+   - sleep:
+       duration: 60
+   - ceph.restart:
+       daemons: [osd.0, osd.1, osd.2, osd.3]
        wait-for-healthy: true
    - sleep:
        duration: 60
@@ -29,8 +39,12 @@ upgrade-sequence:
    - sleep:
        duration: 60
    - ceph.restart:
-       daemons: [osd.2, osd.3]
-       wait-for-healthy: false
-       wait-for-osds-up: true
+       daemons: [osd.4, osd.5, osd.6, osd.7]
+       wait-for-healthy: true
+   - sleep:
+       duration: 60
+   - ceph.restart:
+       daemons: [osd.8, osd.9, osd.10, osd.11]
+       wait-for-healthy: true
    - sleep:
        duration: 60

diff --git a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/+ b/qa/suites/upgrade/luminous-x/parallel/4-final-workload/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/.qa b/qa/suites/upgrade/luminous-x/parallel/4-final-workload/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

diff --git a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/blogbench.yaml b/qa/suites/upgrade/luminous-x/parallel/4-final-workload/blogbench.yaml
deleted file mode 100644 (file)
index 205f72e..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/blogbench.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-meta:
-- desc: |
-   run a cephfs stress test
-   mount ceph-fuse on client.3 before running workunit
-tasks:
-- sequential:
-  - ceph-fuse:
-  - print: "**** done ceph-fuse 4-final-workload"
-  - workunit:
-      clients:
-         client.3:
-          - suites/blogbench.sh
-  - print: "**** done suites/blogbench.sh 4-final-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rados-snaps-few-objects.yaml b/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rados-snaps-few-objects.yaml
deleted file mode 100644 (file)
index d8b3dcb..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rados-snaps-few-objects.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-meta:
-- desc: |
-   randomized correctness test for rados operations on a replicated pool with snapshots
-tasks:
-  - rados:
-      clients: [client.1]
-      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 4-final-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rados_loadgenmix.yaml b/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rados_loadgenmix.yaml
deleted file mode 100644 (file)
index 922a9da..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rados_loadgenmix.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-meta:
-- desc: |
-   generate read/write load with rados objects ranging from 1 byte to 1MB
-tasks:
-  - workunit:
-      clients:
-        client.1:
-          - rados/load-gen-mix.sh
-  - print: "**** done rados/load-gen-mix.sh 4-final-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rados_mon_thrash.yaml b/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rados_mon_thrash.yaml
deleted file mode 100644 (file)
index 98f051d..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rados_mon_thrash.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-meta:
-- desc: |
-   librados C and C++ api tests
-overrides:
-  ceph:
-    log-whitelist:
-      - reached quota
-      - \(REQUEST_SLOW\)
-tasks:
-  - mon_thrash:
-      revive_delay: 20
-      thrash_delay: 1
-  - print: "**** done mon_thrash 4-final-workload"
-  - workunit:
-      branch: luminous
-      clients:
-        client.1:
-          - rados/test.sh
-  - print: "**** done rados/test.sh 4-final-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rbd_cls.yaml b/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rbd_cls.yaml
deleted file mode 100644 (file)
index aaf0a37..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rbd_cls.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-meta:
-- desc: |
-   rbd object class functional tests
-tasks:
-  - workunit:
-      clients:
-        client.1:
-          - cls/test_cls_rbd.sh
-  - print: "**** done cls/test_cls_rbd.sh 4-final-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rbd_import_export.yaml b/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rbd_import_export.yaml
deleted file mode 100644 (file)
index 46e1355..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rbd_import_export.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-meta:
-- desc: |
-   run basic import/export cli tests for rbd
-tasks:
-  - workunit:
-      clients:
-        client.1:
-          - rbd/import_export.sh
-      env:
-        RBD_CREATE_ARGS: --new-format
-  - print: "**** done rbd/import_export.sh 4-final-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rgw.yaml b/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rgw.yaml
deleted file mode 100644 (file)
index 00855dc..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rgw.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-overrides:
-  rgw:
-    frontend: civetweb
-tasks:
-  - sequential:
-    - rgw: [client.1]
-    - print: "**** done rgw 4-final-workload"
-    - rgw-final-workload

diff --git a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rgw_ragweed_check.yaml b/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rgw_ragweed_check.yaml
deleted file mode 100644 (file)
index 7f31cac..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rgw_ragweed_check.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-meta:
-- desc: |
-    ragweed check for rgw
-rgw-final-workload:
-  full_sequential:
-  - ragweed:
-      client.1:
-        default-branch: ceph-master
-        rgw_server: client.1
-        stages: check
-  - print: "**** done ragweed check 4-final-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rgw_swift.yaml b/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rgw_swift.yaml
deleted file mode 100644 (file)
index 45c136f..0000000
--- a/qa/suites/upgrade/luminous-x/parallel/4-final-workload/rgw_swift.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-meta:
-- desc: |
-   swift api tests for rgw
-rgw-final-workload:
-  full_sequential:
-  - swift:
-      client.1:
-        force-branch: ceph-master
-        rgw_server: client.1
-  - print: "**** done swift 4-final-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/4-msgr2.yaml b/qa/suites/upgrade/luminous-x/parallel/4-msgr2.yaml
new file mode 100644 (file)
index 0000000..60e3e20
--- /dev/null
+++ b/qa/suites/upgrade/luminous-x/parallel/4-msgr2.yaml
@@ -0,0 +1,5 @@
+tasks:
+- exec:
+    mon.a:
+      - ceph mon enable-msgr2
+      - ceph config rm global mon_warn_on_msgr2_not_enabled

diff --git a/qa/suites/upgrade/luminous-x/parallel/4-nautilus.yaml b/qa/suites/upgrade/luminous-x/parallel/4-nautilus.yaml
new file mode 120000 (symlink)
index 0000000..9e99b7d
--- /dev/null
+++ b/qa/suites/upgrade/luminous-x/parallel/4-nautilus.yaml
@@ -0,0 +1 @@
+.qa/releases/nautilus.yaml
\ No newline at end of file

diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/+ b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/.qa b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/blogbench.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/blogbench.yaml
new file mode 100644 (file)
index 0000000..205f72e
--- /dev/null
+++ b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/blogbench.yaml
@@ -0,0 +1,13 @@
+meta:
+- desc: |
+   run a cephfs stress test
+   mount ceph-fuse on client.3 before running workunit
+tasks:
+- sequential:
+  - ceph-fuse:
+  - print: "**** done ceph-fuse 4-final-workload"
+  - workunit:
+      clients:
+         client.3:
+          - suites/blogbench.sh
+  - print: "**** done suites/blogbench.sh 4-final-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados-snaps-few-objects.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados-snaps-few-objects.yaml
new file mode 100644 (file)
index 0000000..d8b3dcb
--- /dev/null
+++ b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados-snaps-few-objects.yaml
@@ -0,0 +1,17 @@
+meta:
+- desc: |
+   randomized correctness test for rados operations on a replicated pool with snapshots
+tasks:
+  - rados:
+      clients: [client.1]
+      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 4-final-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados_loadgenmix.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados_loadgenmix.yaml
new file mode 100644 (file)
index 0000000..922a9da
--- /dev/null
+++ b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados_loadgenmix.yaml
@@ -0,0 +1,9 @@
+meta:
+- desc: |
+   generate read/write load with rados objects ranging from 1 byte to 1MB
+tasks:
+  - workunit:
+      clients:
+        client.1:
+          - rados/load-gen-mix.sh
+  - print: "**** done rados/load-gen-mix.sh 4-final-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados_mon_thrash.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados_mon_thrash.yaml
new file mode 100644 (file)
index 0000000..98f051d
--- /dev/null
+++ b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rados_mon_thrash.yaml
@@ -0,0 +1,19 @@
+meta:
+- desc: |
+   librados C and C++ api tests
+overrides:
+  ceph:
+    log-whitelist:
+      - reached quota
+      - \(REQUEST_SLOW\)
+tasks:
+  - mon_thrash:
+      revive_delay: 20
+      thrash_delay: 1
+  - print: "**** done mon_thrash 4-final-workload"
+  - workunit:
+      branch: luminous
+      clients:
+        client.1:
+          - rados/test.sh
+  - print: "**** done rados/test.sh 4-final-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_cls.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_cls.yaml
new file mode 100644 (file)
index 0000000..aaf0a37
--- /dev/null
+++ b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_cls.yaml
@@ -0,0 +1,9 @@
+meta:
+- desc: |
+   rbd object class functional tests
+tasks:
+  - workunit:
+      clients:
+        client.1:
+          - cls/test_cls_rbd.sh
+  - print: "**** done cls/test_cls_rbd.sh 4-final-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_import_export.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_import_export.yaml
new file mode 100644 (file)
index 0000000..46e1355
--- /dev/null
+++ b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rbd_import_export.yaml
@@ -0,0 +1,11 @@
+meta:
+- desc: |
+   run basic import/export cli tests for rbd
+tasks:
+  - workunit:
+      clients:
+        client.1:
+          - rbd/import_export.sh
+      env:
+        RBD_CREATE_ARGS: --new-format
+  - print: "**** done rbd/import_export.sh 4-final-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw.yaml
new file mode 100644 (file)
index 0000000..00855dc
--- /dev/null
+++ b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw.yaml
@@ -0,0 +1,8 @@
+overrides:
+  rgw:
+    frontend: civetweb
+tasks:
+  - sequential:
+    - rgw: [client.1]
+    - print: "**** done rgw 4-final-workload"
+    - rgw-final-workload

diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_ragweed_check.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_ragweed_check.yaml
new file mode 100644 (file)
index 0000000..7f31cac
--- /dev/null
+++ b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_ragweed_check.yaml
@@ -0,0 +1,11 @@
+meta:
+- desc: |
+    ragweed check for rgw
+rgw-final-workload:
+  full_sequential:
+  - ragweed:
+      client.1:
+        default-branch: ceph-master
+        rgw_server: client.1
+        stages: check
+  - print: "**** done ragweed check 4-final-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_swift.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_swift.yaml
new file mode 100644 (file)
index 0000000..45c136f
--- /dev/null
+++ b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_swift.yaml
@@ -0,0 +1,10 @@
+meta:
+- desc: |
+   swift api tests for rgw
+rgw-final-workload:
+  full_sequential:
+  - swift:
+      client.1:
+        force-branch: ceph-master
+        rgw_server: client.1
+  - print: "**** done swift 4-final-workload"

diff --git a/qa/suites/upgrade/luminous-x/stress-split/0-cluster/start.yaml b/qa/suites/upgrade/luminous-x/stress-split/0-cluster/start.yaml
index 329fd6ef939e69029276c06c0770e95af25dd434..2bc6ca8068fa649509459d02dc65c36af136dea3 100644 (file)
--- a/qa/suites/upgrade/luminous-x/stress-split/0-cluster/start.yaml
+++ b/qa/suites/upgrade/luminous-x/stress-split/0-cluster/start.yaml
@@ -16,6 +16,7 @@ overrides:
     conf:
       global:
         enable experimental unrecoverable data corrupting features: "*"
+       mon warn on msgr2 not enabled: false
       mon:
         mon warn on osd down out interval zero: false
 roles: