From: Kefu Chai <kchai@redhat.com>
Date: Mon, 28 Jun 2021 03:34:09 +0000 (+0800)
Subject: pybind/mgr/pg_autoscaler: define options using Option
X-Git-Tag: v17.1.0~1522^2~5
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b40de19c23b6b49f8d63bb3911bdebe9a2e19255;p=ceph-ci.git

pybind/mgr/pg_autoscaler: define options using Option

more consistent and less error-prune this way.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/pybind/mgr/pg_autoscaler/module.py b/src/pybind/mgr/pg_autoscaler/module.py
index e2948ea57a2..cf325ae03a3 100644
--- a/src/pybind/mgr/pg_autoscaler/module.py
+++ b/src/pybind/mgr/pg_autoscaler/module.py
@@ -108,10 +108,10 @@ class PgAutoscaler(MgrModule):
     ]
 
     MODULE_OPTIONS = [
-        {
-            'name': 'sleep_interval',
-            'default': str(60),
-        },
+        Option(
+            name='sleep_interval',
+            type='secs',
+            default=60),
         Option(
             'autoscale_profile',
             default='scale-up',
@@ -244,7 +244,7 @@ class PgAutoscaler(MgrModule):
         while not self._shutdown.is_set():
             self._maybe_adjust()
             self._update_progress_events()
-            self._shutdown.wait(timeout=int(self.sleep_interval))
+            self._shutdown.wait(timeout=self.sleep_interval)
 
     def shutdown(self):
         self.log.info('Stopping pg_autoscaler')