mgr/progress: revise message syntax a bit

"osd.0", not "OSD 0"

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/qa/tasks/mgr/test_progress.py b/qa/tasks/mgr/test_progress.py
index 46310cbd3b1c04853d488db69c952ea1b1f3bb3c..bd9bc89eb7ae4dc236ad90d40d51c4ecedcfbdb1 100644 (file)
--- 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 8bd63093a2964d26ad0accf1969301cc62079ffc..805aa6d6a2bf13138e3787214eada384a35645bc 100644 (file)
--- 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)