From: Kamoltat (Junior) Sirivadhna Date: Tue, 13 Aug 2019 03:15:25 +0000 (-0400) Subject: mgr/progress/module.py: s/events/_events/ #29625 X-Git-Tag: v15.1.0~1824^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=297a0a33a2e34aed7b6e5456c34f0751c403dd03;p=ceph-ci.git mgr/progress/module.py: s/events/_events/ #29625 Fixes time out failure because the module was trying to accessing attribute events line 437 in this block of code: 435 if marked == "in": 436 for ev_id in list(self._events): 437 ev = self.events[ev_id] 438 if isinstance(ev, PgRecoveryEvent) and osd_id in ev.which_osds: 439 self.log.info("osd.{0} came back in, cancelling event".format( 440 osd_id 441 )) 442 self._complete(ev) Therefore, it wouldn't trigger an event Fixes: https://tracker.ceph.com/issues/40618 Signed-off-by: Kamoltat (Junior) Sirivadhna --- diff --git a/src/pybind/mgr/progress/module.py b/src/pybind/mgr/progress/module.py index 4caa47d2cd5..5b67b79ee3b 100644 --- a/src/pybind/mgr/progress/module.py +++ b/src/pybind/mgr/progress/module.py @@ -434,7 +434,7 @@ class Module(MgrModule): # previous recovery event for that osd if marked == "in": for ev_id in list(self._events): - ev = self.events[ev_id] + ev = self._events[ev_id] if isinstance(ev, PgRecoveryEvent) and osd_id in ev.which_osds: self.log.info("osd.{0} came back in, cancelling event".format( osd_id