From: Sage Weil <sage@newdream.net>
Date: Mon, 15 Feb 2021 18:50:30 +0000 (-0500)
Subject: Merge PR #39381 into master
X-Git-Tag: v17.1.0~2978
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=39231676ebe8785180e94393a291a337aa880770;p=ceph-ci.git

Merge PR #39381 into master

* refs/pull/39381/head:
	mgr/cephadm: based sleep interval on configured intervals/timeouts

Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

39231676ebe8785180e94393a291a337aa880770
diff --cc src/pybind/mgr/cephadm/serve.py
index 444a7f3ffd7,19075541ab4..5509e0e6c6b
--- a/src/pybind/mgr/cephadm/serve.py
+++ b/src/pybind/mgr/cephadm/serve.py
@@@ -98,9 -97,17 +98,17 @@@ 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.wait(sleep_interval)
          self.mgr.event.clear()
  
      def _update_paused_health(self) -> None: