From: Sage Weil <sage@redhat.com>
Date: Fri, 21 Feb 2020 01:07:32 +0000 (-0600)
Subject: mgr/cephadm: fix upgrade wait loop
X-Git-Tag: v15.1.1~331^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F33447%2Fhead;p=ceph.git

mgr/cephadm: fix upgrade wait loop

This was succeeding after 4 tries even though it wasn't ok-to-stop.

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 744071bd996..d73da8ba087 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -579,9 +579,7 @@ class CephadmOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin):
                 self.log.info('Upgrade: It is safe to stop %s.%s' %
                               (s.daemon_type, s.daemon_id))
                 return True
-        self.log.info('Upgrade: It is safe to stop %s.%s' %
-                      (s.daemon_type, s.daemon_id))
-        return True
+        return False
 
     def _clear_upgrade_health_checks(self):
         for k in ['UPGRADE_NO_STANDBY_MGR',