]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
vstart_runner.py: fix OSError when checking if non-existent path is mounted 33856/head
authorAlfonso Martínez <almartin@redhat.com>
Tue, 10 Mar 2020 14:06:35 +0000 (15:06 +0100)
committerAlfonso Martínez <almartin@redhat.com>
Tue, 10 Mar 2020 14:06:35 +0000 (15:06 +0100)
Fixes: https://tracker.ceph.com/issues/44545
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
qa/tasks/vstart_runner.py

index 8d48152afd6f7f6204246ba828feff8e19f80eac..7055ebb7c9d8d71fe8eb5285704932e584e9c97b 100644 (file)
@@ -1408,11 +1408,11 @@ def exec_test():
             mount = LocalFuseMount(ctx, test_dir, client_id)
 
         mounts.append(mount)
-        if mount.is_mounted():
-            log.warn("unmounting {0}".format(mount.mountpoint))
-            mount.umount_wait()
-        else:
-            if os.path.exists(mount.mountpoint):
+        if os.path.exists(mount.mountpoint):
+            if mount.is_mounted():
+                log.warn("unmounting {0}".format(mount.mountpoint))
+                mount.umount_wait()
+            else:
                 os.rmdir(mount.mountpoint)
 
     from tasks.cephfs_test_runner import DecoratingLoader