From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 3 Apr 2024 14:20:50 +0000 (-0400)
Subject: qa: make teardown behavior consistent for kclient/fuse mounts
X-Git-Tag: v20.0.0~2107^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=209ef506e19215befdabddef8a7c44f44e96ee81;p=ceph.git

qa: make teardown behavior consistent for kclient/fuse mounts

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/qa/tasks/cephfs/fuse_mount.py b/qa/tasks/cephfs/fuse_mount.py
index 9881f8599d47..69b8651a8504 100644
--- a/qa/tasks/cephfs/fuse_mount.py
+++ b/qa/tasks/cephfs/fuse_mount.py
@@ -418,8 +418,6 @@ class FuseMount(CephFSMount):
         """
         super(FuseMount, self).teardown()
 
-        self.umount()
-
         if self.fuse_daemon and not self.fuse_daemon.finished:
             self.fuse_daemon.stdin.close()
             try:
diff --git a/qa/tasks/cephfs/kernel_mount.py b/qa/tasks/cephfs/kernel_mount.py
index c59f661a3cff..a919918644e2 100644
--- a/qa/tasks/cephfs/kernel_mount.py
+++ b/qa/tasks/cephfs/kernel_mount.py
@@ -204,11 +204,6 @@ class KernelMount(CephFSMount):
         """
         assert self.is_mounted()
 
-    def teardown(self):
-        super(KernelMount, self).teardown()
-        if self.is_mounted():
-            self.umount()
-
     def _get_debug_dir(self):
         """
         Get the debugfs folder for this mount
diff --git a/qa/tasks/cephfs/mount.py b/qa/tasks/cephfs/mount.py
index ba4874cc92da..3ec54058f568 100644
--- a/qa/tasks/cephfs/mount.py
+++ b/qa/tasks/cephfs/mount.py
@@ -1383,6 +1383,9 @@ class CephFSMount(object):
         log.info("Terminating background process")
         self.kill_background()
 
+        if self.is_mounted():
+            self.umount()
+
     def _kill_background(self, p):
         if p.stdin:
             p.stdin.close()