]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #39381 into master
authorSage Weil <sage@newdream.net>
Mon, 15 Feb 2021 18:50:30 +0000 (13:50 -0500)
committerSage Weil <sage@newdream.net>
Mon, 15 Feb 2021 18:50:30 +0000 (13:50 -0500)
* refs/pull/39381/head:
mgr/cephadm: based sleep interval on configured intervals/timeouts

Reviewed-by: Sebastian Wagner <swagner@suse.com>
1  2 
src/pybind/mgr/cephadm/serve.py

index 444a7f3ffd72061c6233ba93deb6b963385c52fd,19075541ab45aeea150c64be34f3b1661071e3fe..5509e0e6c6be59cd3bc8db7532889bf1b2d1576f
@@@ -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: