From: Adam King Date: Tue, 1 Nov 2022 14:46:44 +0000 (-0400) Subject: cephadm: shutdown gatherers when shutting down agent X-Git-Tag: v18.1.0~552^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d5ffe80bc5344c01d9aac8b6afc9233b1f4bbabe;p=ceph.git 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 --- diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index 921ff2e7e7fa..dcdd0f6d953a 100755 --- 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 7365cd2a6f5c..5c9c1680b44d 100644 --- 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():