From 339298ffa65554370634e2988f848c3700e3ec92 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 6 Feb 2020 13:51:42 -0600 Subject: [PATCH] mgr/cephadm: refresh services in upgrade loop Signed-off-by: Sage Weil --- src/pybind/mgr/cephadm/module.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index 3a8798792bc61..ba93e54ad68d2 100644 --- 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): -- 2.39.5