From: Sage Weil <sage@newdream.net>
Date: Tue, 9 Feb 2021 18:31:05 +0000 (-0600)
Subject: mgr/cephadm: based sleep interval on configured intervals/timeouts
X-Git-Tag: v17.1.0~2978^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F39381%2Fhead;p=ceph.git

mgr/cephadm: based sleep interval on configured intervals/timeouts

Set a semi-arbitrary floor of 15 seconds.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py
index 099876324e77..19075541ab45 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()