From d00186cbb5deedc46e5e9e0cc1adb001e018129f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 29 Feb 2020 15:59:25 -0600 Subject: [PATCH] mgr/cephadm: apply services after refreshing inventory Ensure we have an inventory to apply against. Signed-off-by: Sage Weil --- src/pybind/mgr/cephadm/module.py | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index a415568bdd3..6f6c36ef84f 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -995,19 +995,6 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule): self.log.debug("serve starting") while self.run: self._check_hosts() - self._remove_osds_bg() - service_completions = self._apply_services() - for service_completion in service_completions: - if service_completion: - while not service_completion.has_result: - self.process([service_completion]) - self.log.debug(f'Still processing {service_completion}') - if service_completion.needs_result: - time.sleep(1) - else: - break - if service_completion.exception is not None: - self.log.error(str(service_completion.exception)) # refresh daemons self.log.debug('refreshing hosts') @@ -1037,6 +1024,21 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule): self._check_for_strays() + self._remove_osds_bg() + + service_completions = self._apply_services() + for service_completion in service_completions: + if service_completion: + while not service_completion.has_result: + self.process([service_completion]) + self.log.debug(f'Still processing {service_completion}') + if service_completion.needs_result: + time.sleep(1) + else: + break + if service_completion.exception is not None: + self.log.error(str(service_completion.exception)) + if self.upgrade_state and not self.upgrade_state.get('paused'): upgrade_completion = self._do_upgrade() if upgrade_completion: -- 2.39.5