From: Sage Weil <sage@redhat.com>
Date: Wed, 9 Oct 2019 19:09:19 +0000 (-0500)
Subject: mgr/pg_autoscaler: complete event if pool disappears
X-Git-Tag: v15.1.0~1270^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c23d62c79520820f6179bf168013978e20581459;p=ceph-ci.git

mgr/pg_autoscaler: complete event if pool disappears

Fixes: 091dc321b10c8432192a8f76823a0ea97096885d
Fixes: https://tracker.ceph.com/issues/42249
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/pybind/mgr/pg_autoscaler/module.py b/src/pybind/mgr/pg_autoscaler/module.py
index 22e92ce4ddf..0f8dd1bde87 100644
--- a/src/pybind/mgr/pg_autoscaler/module.py
+++ b/src/pybind/mgr/pg_autoscaler/module.py
@@ -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']