From 79333c0390905771d4c6891192520a172ee7e00e Mon Sep 17 00:00:00 2001 From: Adam King Date: Sun, 15 Jan 2023 16:30:53 -0500 Subject: [PATCH] mgr/cephadm: don't attempt daemon actions for daemons on offline hosts They'll just fail anyway, and it will waste time waiting for the connection to timeout. We have other places in the serve loop that will check if the host is back online. Signed-off-by: Adam King (cherry picked from commit e1d3e38f87bce4e53eb7e4c29c812a7ed750fa80) --- src/pybind/mgr/cephadm/serve.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py index c4ad64e01d673..278ebab869ee9 100644 --- a/src/pybind/mgr/cephadm/serve.py +++ b/src/pybind/mgr/cephadm/serve.py @@ -845,6 +845,12 @@ class CephadmServe: assert dd.hostname is not None assert dd.daemon_type is not None assert dd.daemon_id is not None + + # any action we can try will fail for a daemon on an offline host, + # including removing the daemon + if dd.hostname in self.mgr.offline_hosts: + continue + if not spec and dd.daemon_type not in ['mon', 'mgr', 'osd']: # (mon and mgr specs should always exist; osds aren't matched # to a service spec) -- 2.39.5