]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/progress/module.py: s/events/_events/ #29625 29625/head
authorKamoltat (Junior) Sirivadhna <ksirivad@redhat.com>
Tue, 13 Aug 2019 03:15:25 +0000 (23:15 -0400)
committerKamoltat (Junior) Sirivadhna <ksirivad@redhat.com>
Fri, 16 Aug 2019 20:50:48 +0000 (16:50 -0400)
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 <ksirivad@redhat.com>
src/pybind/mgr/progress/module.py

index 4caa47d2cd52c0e685da3c5f6ba7e262bb4e768f..5b67b79ee3baaa7985388fac8d7c6efa406c26ba 100644 (file)
@@ -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