From: Sage Weil <sage@redhat.com>
Date: Wed, 15 Aug 2018 16:26:33 +0000 (-0500)
Subject: mgr/devicehealth: fix sleep_interval configurable
X-Git-Tag: v14.0.1~451^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=894644c0b86fceb6974d2558cf1e809b84e80a97;p=ceph.git

mgr/devicehealth: fix sleep_interval configurable

In reality there isn't much use in changing this, but...

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/pybind/mgr/devicehealth/module.py b/src/pybind/mgr/devicehealth/module.py
index 5f199dc90a4..f773b51f725 100644
--- a/src/pybind/mgr/devicehealth/module.py
+++ b/src/pybind/mgr/devicehealth/module.py
@@ -21,6 +21,7 @@ DEFAULTS = {
     'mark_out_threshold': str(86400*14),
     'warn_threshold': str(86400*14*2),
     'self_heal': str(True),
+    'sleep_interval': str(60),
 }
 
 DEVICE_HEALTH = 'DEVICE_HEALTH'
@@ -42,6 +43,7 @@ class Module(MgrModule):
         {'name': 'mark_out_threshold'},
         {'name': 'warn_threshold'},
         {'name': 'self_heal'},
+        {'name': 'sleep_interval'},
     ]
 
     COMMANDS = [
@@ -150,8 +152,7 @@ class Module(MgrModule):
         while self.run:
             self.refresh_config()
 
-            # TODO normalize/align sleep interval
-            sleep_interval = int(self.scrape_frequency)
+            sleep_interval = int(self.sleep_interval) or 60
 
             self.log.debug('Sleeping for %d seconds', sleep_interval)
             ret = self.event.wait(sleep_interval)