From: Sage Weil <sage@redhat.com>
Date: Fri, 21 Feb 2020 18:50:10 +0000 (-0600)
Subject: mgr/cephadm: fix upgrade ok-to-stop condition check
X-Git-Tag: v15.1.1~309^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F33469%2Fhead;p=ceph.git

mgr/cephadm: fix upgrade ok-to-stop condition check

Broke this in 1072a7e3b5026c1e605dd45967fa555d2e6a0d14

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

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index d73da8ba087e..4e3c19a94cd3 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -563,7 +563,9 @@ class CephadmOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin):
         tries = 4
         while tries > 0:
             if s.daemon_type not in ['mon', 'osd', 'mds']:
-                break
+                self.log.info('Upgrade: It is presumed safe to stop %s.%s' %
+                              (s.daemon_type, s.daemon_id))
+                return True
             ret, out, err = self.mon_command({
                 'prefix': '%s ok-to-stop' % s.daemon_type,
                 'ids': [s.daemon_id],