RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-04 02:02:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgr/progress: revise message syntax a bit

Browse Source 
"osd.0", not "OSD 0"

Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2019-02-08 13:50:18 -06:00
parent 7678bfa6b2
commit 1d305f1264
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qa/tasks/mgr/test_progress.py
View File

@ -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

4
src/pybind/mgr/progress/module.py
View File

@ -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)