]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/pg_autoscaler: complete event if pool disappears 30819/head
authorSage Weil <sage@redhat.com>
Wed, 9 Oct 2019 19:09:19 +0000 (14:09 -0500)
committerSage Weil <sage@redhat.com>
Fri, 11 Oct 2019 00:30:59 +0000 (19:30 -0500)
Fixes: 091dc321b10c8432192a8f76823a0ea97096885d
Fixes: https://tracker.ceph.com/issues/42249
Signed-off-by: Sage Weil <sage@redhat.com>
src/pybind/mgr/pg_autoscaler/module.py

index 22e92ce4ddf1335602d944fc07fc86c23bf828ab..0f8dd1bde875632c5be0456313321da9b25df26d 100644 (file)
@@ -350,6 +350,11 @@ class PgAutoscaler(MgrModule):
         pools = osdmap.get_pools()
         for pool_id in list(self._event):
             ev = self._event[pool_id]
+            if int(pool_id) not in pools:
+                # pool is gone
+                self.remote('progress', 'complete', ev._ev_id)
+                del self._event[pool_id]
+                continue
             pool_data = pools[int(pool_id)]
             pg_num = pool_data['pg_num']
             pg_num_target = pool_data['pg_num_target']