From 66f18ecd09973ceab4ff9ff177e69d9c61a30bf2 Mon Sep 17 00:00:00 2001
From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 23 Apr 2019 13:15:49 -0700
Subject: [PATCH] qa: use mimic-O upgrade process

Fixes: https://tracker.ceph.com/issues/39436

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---
 .../old_client/tasks/2-upgrade.yaml           | 44 ++++++++++++++++++-
 .../upgraded_client/tasks/2-upgrade.yaml      | 44 ++++++++++++++++++-
 2 files changed, 84 insertions(+), 4 deletions(-)

diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml
index 5c50d60c460..701fbea6424 100644
--- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml
@@ -1,3 +1,21 @@
+overrides:
+  ceph:
+    mon_bind_msgr2: false
+    mon_bind_addrvec: false
+    log-whitelist:
+    - scrub mismatch
+    - ScrubResult
+    - wrongly marked
+    - \(POOL_APP_NOT_ENABLED\)
+    - \(SLOW_OPS\)
+    - overall HEALTH_
+    - \(MON_MSGR2_NOT_ENABLED\)
+    conf:
+      global:
+        bluestore warn on legacy statfs: false
+      mon:
+        mon warn on osd down out interval zero: false
+
 tasks:
 - mds_pre_upgrade:
 - print: "**** done mds pre-upgrade sequence"
@@ -5,8 +23,30 @@ tasks:
     mon.a:
     mon.b:
 - print: "**** done install.upgrade both hosts"
-- ceph.stop: [mds.*]
 - ceph.restart:
-    daemons: [mon.*, mgr.*, osd.*, mds.*]
+    daemons: [mon.*, mgr.*]
     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.*]
+    wait-for-healthy: false
+    wait-for-osds-up: true
+- ceph.stop: [mds.*]
+- ceph.restart:
+    daemons: [mds.*]
+    wait-for-healthy: false
+    wait-for-osds-up: true
+- exec:
+    mon.a:
+    - ceph mon enable-msgr2
+    - ceph config rm global mon_warn_on_msgr2_not_enabled
+- exec:
+    mon.a:
+    - ceph osd require-osd-release nautilus
+    #- ceph osd set-require-min-compat-client nautilus
+- ceph.healthy:
 - print: "**** done ceph.restart"
diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml
index 5c50d60c460..701fbea6424 100644
--- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml
@@ -1,3 +1,21 @@
+overrides:
+  ceph:
+    mon_bind_msgr2: false
+    mon_bind_addrvec: false
+    log-whitelist:
+    - scrub mismatch
+    - ScrubResult
+    - wrongly marked
+    - \(POOL_APP_NOT_ENABLED\)
+    - \(SLOW_OPS\)
+    - overall HEALTH_
+    - \(MON_MSGR2_NOT_ENABLED\)
+    conf:
+      global:
+        bluestore warn on legacy statfs: false
+      mon:
+        mon warn on osd down out interval zero: false
+
 tasks:
 - mds_pre_upgrade:
 - print: "**** done mds pre-upgrade sequence"
@@ -5,8 +23,30 @@ tasks:
     mon.a:
     mon.b:
 - print: "**** done install.upgrade both hosts"
-- ceph.stop: [mds.*]
 - ceph.restart:
-    daemons: [mon.*, mgr.*, osd.*, mds.*]
+    daemons: [mon.*, mgr.*]
     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.*]
+    wait-for-healthy: false
+    wait-for-osds-up: true
+- ceph.stop: [mds.*]
+- ceph.restart:
+    daemons: [mds.*]
+    wait-for-healthy: false
+    wait-for-osds-up: true
+- exec:
+    mon.a:
+    - ceph mon enable-msgr2
+    - ceph config rm global mon_warn_on_msgr2_not_enabled
+- exec:
+    mon.a:
+    - ceph osd require-osd-release nautilus
+    #- ceph osd set-require-min-compat-client nautilus
+- ceph.healthy:
 - print: "**** done ceph.restart"
-- 
2.39.5