mgr/dashboard: tasks: only unblock controller thread after TaskManage…

…r thread Fixes: https://tracker.ceph.com/issues/42187 Signed-off-by: Ricardo Dias <[email protected]>
mitsu-ko · Oct 7, 2019 · f6dd9a9 · f6dd9a9
1 parent 20c8007
commit f6dd9a9
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/pybind/mgr/dashboard/tools.py b/src/pybind/mgr/dashboard/tools.py
@@ -585,6 +585,7 @@ def __repr__(self):
         return str(self)
 
     def _run(self):
+        NotificationQueue.register(self._handle_task_finished, 'cd_task_finished', 100)
         with self.lock:
             assert not self.running
             self.executor.init(self)
@@ -610,10 +611,14 @@ def _complete(self, ret_value, exception=None):
             if not self.exception:
                 self.set_progress(100, True)
         NotificationQueue.new_notification('cd_task_finished', self)
-        self.event.set()
         logger.debug("TK: execution of %s finished in: %s s", self,
                      self.duration)
 
+    def _handle_task_finished(self, task):
+        if self == task:
+            NotificationQueue.deregister(self._handle_task_finished)
+            self.event.set()
+
     def wait(self, timeout=None):
         with self.lock:
             assert self.running, "wait cannot be called before _run"