From: Sage Weil <sage@redhat.com>
Date: Tue, 18 Feb 2020 19:07:13 +0000 (-0600)
Subject: mgr/cephadm: fix invalidate helpers
X-Git-Tag: v15.1.1~355^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f4350f67493dcc124d7bc8f1b538658df3751eca;p=ceph.git

mgr/cephadm: fix invalidate helpers

These should wake up the serve() thread.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index a8eddecbef31..bfea30ffbfcd 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -163,11 +163,13 @@ class HostCache():
         # type: (str) -> None
         if host in self.last_daemon_update:
             del self.last_daemon_update[host]
+        self.mgr.event.set()
 
     def invalidate_host_devices(self, host):
         # type: (str) -> None
         if host in self.last_device_update:
             del self.last_device_update[host]
+        self.mgr.event.set()
 
     def save_host(self, host):
         # type: (str) -> None
@@ -1870,7 +1872,6 @@ class CephadmOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin):
             sd.status_desc = 'starting'
             self.cache.add_daemon(host, sd)
         self.cache.invalidate_host_daemons(host)
-        self.event.set()
         return "{} {} on host '{}'".format(
             'Reconfigured' if reconfig else 'Deployed', name, host)