From cea39d2f0196181e3ce7a7765903b0dbb4fd63fa Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 2 Apr 2019 16:41:15 -0500 Subject: [PATCH] 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 --- qa/suites/upgrade/nautilus-x-singleton/0-cluster/start.yaml | 2 +- .../nautilus-x-singleton/2-partial-upgrade/firsthalf.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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 3c65ea9ccc5..c3c9566ac53 100644 --- 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 a6cf4a46094..90c28d46f10 100644 --- 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 -- 2.39.5