From: Adam King Date: Fri, 21 Oct 2022 20:54:31 +0000 (-0400) Subject: mgr/cephadm: remove host from offline_hosts list when removing host X-Git-Tag: v17.2.6~71^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bad5966660909d50b428717715acf504dfd67ae5;p=ceph.git mgr/cephadm: remove host from offline_hosts list when removing host Otherwise, it could remain in the list and cephadm could think there is an offline host in the cluster when said host has actually already been removed. Signed-off-by: Adam King (cherry picked from commit beea26fc267c338ac4ed58a39535f017f892ea85) --- diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index bd02b3527ae0..e42903de2424 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -1536,6 +1536,7 @@ Then run the following: self.inventory.rm_host(host) self.cache.rm_host(host) self.ssh.reset_con(host) + self.offline_hosts_remove(host) # if host was in offline host list, we should remove it now. self.event.set() # refresh stray health check self.log.info('Removed host %s' % host) return "Removed {} host '{}'".format('offline' if offline else '', host)