From: Sage Weil <sage@newdream.net>
Date: Sun, 28 Feb 2021 16:07:12 +0000 (-0600)
Subject: Merge PR #39483 into pacific
X-Git-Tag: v16.2.0~167
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=324d707374c35f7215930e2b2d14bb49a656f559;p=ceph.git

Merge PR #39483 into pacific

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

Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
---

324d707374c35f7215930e2b2d14bb49a656f559
diff --cc src/pybind/mgr/cephadm/serve.py
index 4f3974bfd80,be3a26b6c0e..93b48b5d3ca
--- 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: