From 74c4366ec3bf6e077b6f9d267838d3b6bca60e52 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 9 Feb 2021 12:31:05 -0600 Subject: [PATCH] mgr/cephadm: based sleep interval on configured intervals/timeouts Set a semi-arbitrary floor of 15 seconds. Signed-off-by: Sage Weil (cherry picked from commit e15c9a24dc7e98172eefdfe852cd75eaa1742895) --- src/pybind/mgr/cephadm/serve.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py index f988295fda0..be3a26b6c0e 100644 --- a/src/pybind/mgr/cephadm/serve.py +++ b/src/pybind/mgr/cephadm/serve.py @@ -97,7 +97,15 @@ class CephadmServe: self.log.debug("serve exit") def _serve_sleep(self) -> None: - sleep_interval = 600 + sleep_interval = max( + 30, + min( + self.mgr.host_check_interval, + self.mgr.facts_cache_timeout, + self.mgr.daemon_cache_timeout, + self.mgr.device_cache_timeout, + ) + ) self.log.debug('Sleeping for %d seconds', sleep_interval) ret = self.mgr.event.wait(sleep_interval) self.mgr.event.clear() -- 2.47.3