From: Xiubo Li <xiubli@redhat.com>
Date: Thu, 5 Mar 2020 01:59:04 +0000 (-0500)
Subject: qa/tasks/vstart_runner: use parent's umount methods
X-Git-Tag: v14.2.12~77^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a23d12b4165d1405670a0f0dfc8c59243b633cd3;p=ceph.git

qa/tasks/vstart_runner: use parent's umount methods

Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit 95820bf48f24579a099a2acf02575cddb3295c4a)

Conflicts:
	qa/tasks/vstart_runner.py
---

diff --git a/qa/tasks/cephfs/fuse_mount.py b/qa/tasks/cephfs/fuse_mount.py
index c71b2041da1d8..664de4f4c8c3e 100644
--- a/qa/tasks/cephfs/fuse_mount.py
+++ b/qa/tasks/cephfs/fuse_mount.py
@@ -248,6 +248,9 @@ class FuseMount(CephFSMount):
         return self.client_remote.run(args=["ls", "-d", self.mountpoint], check_status=False, cwd=self.test_dir, timeout=(15*60)).exitstatus == 0
 
     def umount(self):
+        if not self.is_mounted():
+            return
+
         try:
             log.info('Running fusermount -u on {name}...'.format(name=self.client_remote.name))
             self.client_remote.run(
diff --git a/qa/tasks/cephfs/kernel_mount.py b/qa/tasks/cephfs/kernel_mount.py
index e749c06119c08..d027bcfcc4ca1 100644
--- a/qa/tasks/cephfs/kernel_mount.py
+++ b/qa/tasks/cephfs/kernel_mount.py
@@ -70,6 +70,9 @@ class KernelMount(CephFSMount):
         self.mounted = True
 
     def umount(self, force=False):
+        if not self.is_mounted():
+            return
+
         log.debug('Unmounting client client.{id}...'.format(id=self.client_id))
 
         cmd=['sudo', 'umount', self.mountpoint]
diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py
index 315ab84460e62..bf9809d878088 100644
--- a/qa/tasks/vstart_runner.py
+++ b/qa/tasks/vstart_runner.py
@@ -482,10 +482,6 @@ class LocalFuseMount(FuseMount):
         log.info("I think my launching pid was {0}".format(self.fuse_daemon.subproc.pid))
         return path
 
-    def umount(self):
-        if self.is_mounted():
-            super(LocalFuseMount, self).umount()
-
     def mount(self, mount_path=None, mount_fs_name=None, mountpoint=None):
         if mountpoint is not None:
             self.mountpoint = mountpoint