From 6207c0b3f435c7e185f6658d2f681e14703c1410 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Thu, 14 Feb 2019 16:54:37 -0600
Subject: [PATCH] qa/suites/upgrade/mimic-x/parallel: update for msgr v2

Signed-off-by: Sage Weil <sage@redhat.com>
---
 .../mimic-x/parallel/0-cluster/start.yaml     |  7 ++++++-
 .../parallel/1-ceph-install/mimic.yaml        |  3 ++-
 .../3-upgrade-sequence/upgrade-all.yaml       | 11 ++++++++---
 .../upgrade-mon-osd-mds.yaml                  | 19 +++++++++++++++++--
 .../upgrade/mimic-x/parallel/4-msgr2.yaml     |  5 +++++
 .../upgrade/mimic-x/parallel/4-nautilus.yaml  |  1 +
 6 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 qa/suites/upgrade/mimic-x/parallel/4-msgr2.yaml
 create mode 120000 qa/suites/upgrade/mimic-x/parallel/4-nautilus.yaml

diff --git a/qa/suites/upgrade/mimic-x/parallel/0-cluster/start.yaml b/qa/suites/upgrade/mimic-x/parallel/0-cluster/start.yaml
index fe174f5b8ab..38282ab50a0 100644
--- a/qa/suites/upgrade/mimic-x/parallel/0-cluster/start.yaml
+++ b/qa/suites/upgrade/mimic-x/parallel/0-cluster/start.yaml
@@ -14,9 +14,13 @@ roles:
   - osd.0
   - osd.1
 - - mon.b
-  - mon.c
+  - mgr.y
   - osd.2
   - osd.3
+- - mon.c
+  - mds.b
+  - osd.4
+  - osd.5
 - - client.0
   - client.1
   - client.2
@@ -32,6 +36,7 @@ overrides:
     - \(POOL_APP_NOT_ENABLED\)
     - \(SLOW_OPS\)
     - overall HEALTH_
+    - \(MON_MSGR2_NOT_ENABLED\)
     conf:
       global:
         enable experimental unrecoverable data corrupting features: "*"
diff --git a/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml b/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml
index 3d978dbb7c7..2edc4a6e602 100644
--- a/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml
+++ b/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml
@@ -40,7 +40,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/mimic-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/qa/suites/upgrade/mimic-x/parallel/3-upgrade-sequence/upgrade-all.yaml
index 5c021bdf130..15a3271fe8c 100644
--- a/qa/suites/upgrade/mimic-x/parallel/3-upgrade-sequence/upgrade-all.yaml
+++ b/qa/suites/upgrade/mimic-x/parallel/3-upgrade-sequence/upgrade-all.yaml
@@ -4,14 +4,19 @@ meta:
 upgrade-sequence:
    sequential:
    - ceph.restart:
-       daemons: [mon.a, mon.b, mon.c, mgr.x]
+       daemons: [mon.a, mon.b, mon.c, mgr.x, mgr.y]
        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]
        wait-for-healthy: false
        wait-for-osds-up: true
    - ceph.restart:
-       daemons: [mds.a]
+       daemons: [mds.a, mds.b]
        wait-for-healthy: false
        wait-for-osds-up: true
    - print: "**** done ceph.restart all"
diff --git a/qa/suites/upgrade/mimic-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/qa/suites/upgrade/mimic-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
index 46a1345fb15..cf8b716440e 100644
--- a/qa/suites/upgrade/mimic-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ b/qa/suites/upgrade/mimic-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -13,9 +13,19 @@ 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: [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:
@@ -23,7 +33,12 @@ upgrade-sequence:
        wait-for-healthy: true
    - sleep:
        duration: 60
-   - ceph.restart: [mds.a]
+   - ceph.restart: [mds.a, mds.b]
+   - sleep:
+       duration: 60
+   - ceph.restart:
+       daemons: [osd.4, osd.5]
+       wait-for-healthy: true
    - sleep:
        duration: 60
    - sleep:
diff --git a/qa/suites/upgrade/mimic-x/parallel/4-msgr2.yaml b/qa/suites/upgrade/mimic-x/parallel/4-msgr2.yaml
new file mode 100644
index 00000000000..60e3e200578
--- /dev/null
+++ b/qa/suites/upgrade/mimic-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/mimic-x/parallel/4-nautilus.yaml b/qa/suites/upgrade/mimic-x/parallel/4-nautilus.yaml
new file mode 120000
index 00000000000..9e99b7d2829
--- /dev/null
+++ b/qa/suites/upgrade/mimic-x/parallel/4-nautilus.yaml
@@ -0,0 +1 @@
+.qa/releases/nautilus.yaml
\ No newline at end of file