From 1d305f126415294ce2ae43e8ffff86cf4b53f930 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 8 Feb 2019 13:50:18 -0600 Subject: [PATCH] mgr/progress: revise message syntax a bit "osd.0", not "OSD 0" Signed-off-by: Sage Weil --- qa/tasks/mgr/test_progress.py | 2 +- src/pybind/mgr/progress/module.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qa/tasks/mgr/test_progress.py b/qa/tasks/mgr/test_progress.py index 46310cbd3b1..bd9bc89eb7a 100644 --- a/qa/tasks/mgr/test_progress.py +++ b/qa/tasks/mgr/test_progress.py @@ -101,7 +101,7 @@ class TestProgress(MgrTestCase): timeout=self.EVENT_CREATION_PERIOD) ev = self._all_events()[0] log.info(json.dumps(ev, indent=1)) - self.assertIn("Rebalancing after OSD 0 marked out", ev['message']) + self.assertIn("Rebalancing after osd.0 marked out", ev['message']) return ev diff --git a/src/pybind/mgr/progress/module.py b/src/pybind/mgr/progress/module.py index 8bd63093a29..805aa6d6a2b 100644 --- a/src/pybind/mgr/progress/module.py +++ b/src/pybind/mgr/progress/module.py @@ -348,7 +348,7 @@ class Module(MgrModule): # TODO: reconcile with existing events referring to this OSD going out ev = PgRecoveryEvent( - "Rebalancing after OSD {0} marked out".format(osd_id), + "Rebalancing after osd.{0} marked out".format(osd_id), refs=[("osd", osd_id)], which_pgs=affected_pgs, evactuate_osds=[osd_id] @@ -359,7 +359,7 @@ class Module(MgrModule): def _osd_in(self, osd_id): for ev_id, ev in self._events.items(): if isinstance(ev, PgRecoveryEvent) and osd_id in ev.evacuating_osds: - self.log.info("OSD {0} came back in, cancelling event".format( + self.log.info("osd.{0} came back in, cancelling event".format( osd_id )) self._complete(ev)