]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/cephfs: try usual umount if client blocklisting cannot be inferred
authorVenky Shankar <vshankar@redhat.com>
Thu, 30 Nov 2023 05:31:05 +0000 (11:01 +0530)
committerYuri Weinstein <yweinste@redhat.com>
Thu, 30 Nov 2023 18:18:30 +0000 (18:18 +0000)
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 3d0a927ecf530ba7ef1d2636afc282af7c44435c)

qa/tasks/cephfs/mount.py

index 49399088921487d476e2dc40a95d3ab2fdc35360..4a81874068ff37d21a444ba8c864f4079f38fe04 100644 (file)
@@ -186,6 +186,12 @@ class CephFSMount(object):
                               sudo=True).decode())
 
     def is_blocked(self):
+        if not self.addr:
+            # can't infer if our addr is blocklisted - let the caller try to
+            # umount without lazy/force. If the client was blocklisted, then
+            # the umount would be stuck and the test would fail on timeout.
+            # happens only with Ubuntu 20.04 (missing kclient patches :/).
+            return False
         self.fs = Filesystem(self.ctx, name=self.cephfs_name)
 
         try: