From 70b8a0e87595d514c3953c5561d0ffbe4282ef8a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 17 Feb 2021 15:21:02 -0600 Subject: [PATCH] mgr/cephadm: fix up the strings reporting osd ids Signed-off-by: Sage Weil (cherry picked from commit a1ff3a9952778c1f20836b806de9fa5606432137) --- src/pybind/mgr/cephadm/services/osd.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pybind/mgr/cephadm/services/osd.py b/src/pybind/mgr/cephadm/services/osd.py index f2ca301caaa51..5b388106aae45 100644 --- a/src/pybind/mgr/cephadm/services/osd.py +++ b/src/pybind/mgr/cephadm/services/osd.py @@ -392,9 +392,9 @@ class RemoveUtil(object): 'ids': [str(osd.osd_id) for osd in osds] }) if ret != 0: - self.mgr.log.error(f"Could not set <{flag}> flag for osds: {osds}. <{err}>") + self.mgr.log.error(f"Could not set {flag} flag for {osds}. <{err}>") return False - self.mgr.log.info(f"OSDs <{osds}> are now <{flag}>") + self.mgr.log.info(f"{','.join([str(o) for o in osds])} now {flag}") return True def get_weight(self, osd: "OSD") -> Optional[float]: @@ -688,13 +688,13 @@ class OSDRemovalQueue(object): if not osd.force: # skip criteria if not osd.is_empty: - logger.debug(f"OSD <{osd.osd_id}> is not empty yet. Waiting a bit more") + logger.debug(f"{osd} is not empty yet. Waiting a bit more") new_queue.add(osd) continue if not osd.safe_to_destroy(): logger.debug( - f"OSD <{osd.osd_id}> is not safe-to-destroy yet. Waiting a bit more") + f"{osd} is not safe-to-destroy yet. Waiting a bit more") new_queue.add(osd) continue @@ -702,7 +702,7 @@ class OSDRemovalQueue(object): if not osd.down(): # also remove it from the remove_osd list and set a health_check warning? raise orchestrator.OrchestratorError( - f"Could not set OSD <{osd.osd_id}> to 'down'") + f"Could not mark {osd} down") # stop and remove daemon assert osd.hostname is not None -- 2.39.5