]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-volume: fix the type mismatch, covert the tries and interval to int from string. 32872/head
authortaodd <dongdong.tao@canonical.com>
Sun, 8 Dec 2019 02:10:59 +0000 (10:10 +0800)
committerShyukri Shyukriev <shshyukriev@suse.com>
Sat, 25 Jan 2020 21:06:08 +0000 (23:06 +0200)
Fixes: https://tracker.ceph.com/issues/43186
Signed-off-by: dongdong tao <dongdong.tao@canonical.com>
(cherry picked from commit 81ff4be4d13ce034d7a8b921113138a942e3051a)

src/ceph-volume/ceph_volume/systemd/main.py

index bf24f0a01549f65b0d64e3efc0536965132cfcfc..51fe8352dbb1142352048710a3d7b224a6bd07e1 100644 (file)
@@ -92,8 +92,8 @@ def main(args=None):
     logger.info('parsed sub-command: %s, extra data: %s', sub_command, extra_data)
     command = ['ceph-volume', sub_command, 'trigger', extra_data]
 
-    tries = os.environ.get('CEPH_VOLUME_SYSTEMD_TRIES', 30)
-    interval = os.environ.get('CEPH_VOLUME_SYSTEMD_INTERVAL', 5)
+    tries = int(os.environ.get('CEPH_VOLUME_SYSTEMD_TRIES', 30))
+    interval = int(os.environ.get('CEPH_VOLUME_SYSTEMD_INTERVAL', 5))
     while tries > 0:
         try:
             # don't log any output to the terminal, just rely on stderr/stdout