From 6232b9efd95068d19c09f33e8e5628776fe41b2e Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 6 Mar 2020 12:31:22 -0600 Subject: [PATCH] mgr/cephadm/osd: call synchronous _remove_daemon() Signed-off-by: Sage Weil --- src/pybind/mgr/cephadm/osd.py | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/src/pybind/mgr/cephadm/osd.py b/src/pybind/mgr/cephadm/osd.py index 9a0c243e75cfb..6616b38ca3627 100644 --- a/src/pybind/mgr/cephadm/osd.py +++ b/src/pybind/mgr/cephadm/osd.py @@ -72,23 +72,8 @@ class RemoveUtil(object): # also remove it from the remove_osd list and set a health_check warning? raise orchestrator.OrchestratorError(f"Could not purge OSD <{osd.osd_id}>") - completion = self.mgr._remove_daemon([(osd.fullname, osd.nodename, True)]) - completion.add_progress('Removing OSDs', self.mgr) - completion.update_progress = True - if completion: - while not completion.has_result: - self.mgr.process([completion]) - if completion.needs_result: - time.sleep(1) - else: - break - if completion.exception is not None: - logger.error(str(completion.exception)) - else: - raise orchestrator.OrchestratorError( - "Did not receive a completion from _remove_daemon") - - logger.info(f"Successfully removed removed OSD <{osd.osd_id}> on {osd.nodename}") + self.mgr._remove_daemon(osd.fullname, osd.nodename, True) + logger.info(f"Successfully removed OSD <{osd.osd_id}> on {osd.nodename}") logger.debug(f"Removing {osd.osd_id} from the queue.") self.to_remove_osds.remove(osd) -- 2.39.5