]> 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)
committerJohn Spray <john.spray@redhat.com>
Tue, 1 Sep 2015 10:31:23 +0000 (11:31 +0100)
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>
tasks/cephfs/fuse_mount.py

index 6332852b8232afb63e92654e9a601d40003a55d5..963bea49b8546658026529c036fccc02bf5342af 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)