]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
tasks/cephfs: fix mount_timeout config loading
authorJohn Spray <john.spray@redhat.com>
Tue, 1 Sep 2015 10:31:23 +0000 (11:31 +0100)
committerLoic Dachary <ldachary@redhat.com>
Wed, 7 Oct 2015 20:40:14 +0000 (22:40 +0200)
Previously were defaulting to a string, which
always compared greater than elapsed, so never
timed out.

Fixes: #12820
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 8e275049a0a8b976fc9eb5c63dcefe01bedcc711)

tasks/cephfs/fuse_mount.py

index 63d87b3936049fb2d2ca61ce0dd1c96a589a3c09..1a6f5074d78491f2da2a38cfdf008172ff8cf54b 100644 (file)
@@ -104,7 +104,7 @@ class FuseMount(CephFSMount):
         if mount_wait > 0:
             log.info("Fuse mount waits {0} seconds before checking /sys/".format(mount_wait))
             time.sleep(mount_wait)            
-        timeout = self.client_config.get('mount_timeout', '30')
+        timeout = int(self.client_config.get('mount_timeout', 30))
         waited = 0
         while list_connections() == pre_mount_conns:
             time.sleep(1)