From 1072a7e3b5026c1e605dd45967fa555d2e6a0d14 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 20 Feb 2020 19:07:32 -0600 Subject: [PATCH] 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 --- src/pybind/mgr/cephadm/module.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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', -- 2.39.5