qa: use mimic-O upgrade process

Fixes: https://tracker.ceph.com/issues/39436
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 66f18ecd09973ceab4ff9ff177e69d9c61a30bf2)

Conflicts:
	qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml
	qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml
- trivial

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 a02c48ecd55470512acca7c43baaeff6ef56d2f0..701fbea6424284c576c51073ad85cce99e6866ae 100644 (file)
--- 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,8 +1,20 @@
 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:
@@ -11,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 a02c48ecd55470512acca7c43baaeff6ef56d2f0..701fbea6424284c576c51073ad85cce99e6866ae 100644 (file)
--- 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,8 +1,20 @@
 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:
@@ -11,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"