Skip to content

Commit 97234f4

Browse files
authored
Merge pull request ceph#60614 from adk3798/host-maintenance-exit-refresh-daemons
mgr/cephadm: trigger host metadata refresh when taking host out of maintenance Reviewed-by: Shweta Bhosale <[email protected]>
2 parents 28206c2 + 91b7d9d commit 97234f4

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

src/pybind/mgr/cephadm/module.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2300,6 +2300,10 @@ def exit_host_maintenance(self, hostname: str, force: bool = False, offline: boo
23002300
tgt_host['status'] = ""
23012301
self.inventory._inventory[hostname] = tgt_host
23022302
self.inventory.save()
2303+
# make sure we refresh state for this host now that it's out
2304+
# of maintenance mode. Maintenance mode is a time where users
2305+
# could have theoretically made a lot of changes to the host.
2306+
self._invalidate_all_host_metadata_and_kick_serve(hostname)
23032307

23042308
self.set_maintenance_healthcheck()
23052309

@@ -2383,6 +2387,11 @@ def _invalidate_daemons_and_kick_serve(self, filter_host: Optional[str] = None)
23832387

23842388
self._kick_serve_loop()
23852389

2390+
def _invalidate_all_host_metadata_and_kick_serve(self, hostname: str) -> None:
2391+
# invalidates all metadata for a given host and kicks serve loop
2392+
self.cache.refresh_all_host_info(hostname)
2393+
self._kick_serve_loop()
2394+
23862395
@handle_orch_error
23872396
def describe_service(self, service_type: Optional[str] = None, service_name: Optional[str] = None,
23882397
refresh: bool = False) -> List[orchestrator.ServiceDescription]:

0 commit comments

Comments
 (0)