mgr/cephadm: refresh services in upgrade loop

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 3a8798792bc613dc8b9f4f1f6209ff6d1f395cff..ba93e54ad68d2fb2a8587d3e84b290ad24ffbb76 100644 (file)
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -742,7 +742,7 @@ class CephadmOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin):
 
             self._check_for_strays(services)
 
-            while self.upgrade_state and not self.upgrade_state.get('paused'):
+            if self.upgrade_state and not self.upgrade_state.get('paused'):
                 completion = self._do_upgrade(services)
                 if completion:
                     while not completion.has_result:
@@ -753,11 +753,11 @@ class CephadmOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin):
                             break
                     orchestrator.raise_if_exception(completion)
                 self.log.debug('did _do_upgrade')
-
-            sleep_interval = 600
-            self.log.debug('Sleeping for %d seconds', sleep_interval)
-            ret = self.event.wait(sleep_interval)
-            self.event.clear()
+            else:
+                sleep_interval = 600
+                self.log.debug('Sleeping for %d seconds', sleep_interval)
+                ret = self.event.wait(sleep_interval)
+                self.event.clear()
         self.log.info("serve exit")
 
     def config_notify(self):