cephadm: shutdown gatherers when shutting down agent

No reason to leave these threads running if the agent
is being shut down

Signed-off-by: Adam King <adking@redhat.com>

diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py
index 921ff2e7e7fa1b3c03e95be5980c732e8ba9661b..dcdd0f6d953a0f7bdf93072ddaadde1d057f2c44 100755 (executable)
--- a/src/cephadm/cephadm.py
+++ b/src/cephadm/cephadm.py
@@ -4326,6 +4326,10 @@ WantedBy=ceph-{fsid}.target
         self.stop = True
         if self.mgr_listener.is_alive():
             self.mgr_listener.shutdown()
+        if self.ls_gatherer.is_alive():
+            self.ls_gatherer.shutdown()
+        if self.volume_gatherer.is_alive():
+            self.volume_gatherer.shutdown()
 
     def wakeup(self) -> None:
         self.event.set()

diff --git a/src/cephadm/tests/test_agent.py b/src/cephadm/tests/test_agent.py
index 7365cd2a6f5c23ae61e14c143cd40e6f18e83e54..5c9c1680b44d37ee338f1c937a2a527fecdd2bc5 100644 (file)
--- a/src/cephadm/tests/test_agent.py
+++ b/src/cephadm/tests/test_agent.py
@@ -88,9 +88,13 @@ def test_agent_shutdown(_is_alive):
         _is_alive.return_value = True
         assert agent.stop == False
         assert agent.mgr_listener.stop == False
+        assert agent.ls_gatherer.stop == False
+        assert agent.volume_gatherer.stop == False
         agent.shutdown()
         assert agent.stop == True
         assert agent.mgr_listener.stop == True
+        assert agent.ls_gatherer.stop == True
+        assert agent.volume_gatherer.stop == True
 
 
 def test_agent_wakeup():