Merge pull request ceph#48517 from adk3798/active-mgr-redeploy

mgr/cephadm: save host cache data after scheduling daemon action

Reviewed-by: Michael Fritch <[email protected]>

Author: adk3798

src/pybind/mgr/cephadm/module.py

@@ -2148,6 +2148,7 @@ def _schedule_daemon_action(self, daemon_name: str, action: str) -> str:
             raise OrchestratorError(
                 f'Unable to schedule redeploy for {daemon_name}: No standby MGRs')
         self.cache.schedule_daemon_action(dd.hostname, dd.name(), action)
+        self.cache.save_host(dd.hostname)
         msg = "Scheduled to {} {} on host '{}'".format(action, daemon_name, dd.hostname)
         self._kick_serve_loop()
         return msg

src/pybind/mgr/cephadm/tests/test_cephadm.py

@@ -404,7 +404,8 @@ def test_daemon_action_fail(self, cephadm_module: CephadmOrchestrator):
         ]
     )
     @mock.patch("cephadm.serve.CephadmServe._run_cephadm", _run_cephadm('{}'))
-    def test_daemon_check(self, cephadm_module: CephadmOrchestrator, action):
+    @mock.patch("cephadm.module.HostCache.save_host")
+    def test_daemon_check(self, _save_host, cephadm_module: CephadmOrchestrator, action):
         with with_host(cephadm_module, 'test'):
             with with_service(cephadm_module, ServiceSpec(service_type='grafana'), CephadmOrchestrator.apply_grafana, 'test') as d_names:
                 [daemon_name] = d_names
@@ -416,6 +417,7 @@ def test_daemon_check(self, cephadm_module: CephadmOrchestrator, action):
 
                 CephadmServe(cephadm_module)._check_daemons()
 
+                assert _save_host.called_with('test')
                 assert cephadm_module.cache.get_scheduled_daemon_action('test', daemon_name) is None
 
     @mock.patch("cephadm.serve.CephadmServe._run_cephadm")