qa/suites/upgrade/nautilus-x-singleton: upgrade mgrs early

The mgrmap may change when the mons upgrade, causing the mgr daemons to
respawn.  Restart mgr daemons before mons to avoid a mismatch between
the running version and the ondisk binary.

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

diff --git a/qa/suites/upgrade/nautilus-x-singleton/0-cluster/start.yaml b/qa/suites/upgrade/nautilus-x-singleton/0-cluster/start.yaml
index 3c65ea9ccc5d6797bda5fbd8aeed437f04b834aa..c3c9566ac536dbd82c1b3848ad013fbd0264f111 100644 (file)
--- a/qa/suites/upgrade/nautilus-x-singleton/0-cluster/start.yaml
+++ b/qa/suites/upgrade/nautilus-x-singleton/0-cluster/start.yaml
@@ -24,12 +24,12 @@ roles:
   - osd.2
   - osd.3
 - - mon.b
+  - mgr.y
   - osd.4
   - osd.5
   - osd.6
   - osd.7
 - - mon.c
-  - mgr.y
   - osd.8
   - osd.9
   - osd.10

diff --git a/qa/suites/upgrade/nautilus-x-singleton/2-partial-upgrade/firsthalf.yaml b/qa/suites/upgrade/nautilus-x-singleton/2-partial-upgrade/firsthalf.yaml
index a6cf4a460948cf9d25ece8fab22df8ef82547802..90c28d46f10fdb88b00ad72d523b4d9b82fe6a7f 100644 (file)
--- a/qa/suites/upgrade/nautilus-x-singleton/2-partial-upgrade/firsthalf.yaml
+++ b/qa/suites/upgrade/nautilus-x-singleton/2-partial-upgrade/firsthalf.yaml
@@ -8,6 +8,8 @@ tasks:
     mon.a:
     mon.b:
 - print: "**** done install.upgrade osd.0"
+- ceph.restart:
+    daemons: [mgr.x, mgr.y]
 - ceph.restart:
     daemons: [mon.a, mon.b]
     wait-for-healthy: false