From: Venky Shankar <vshankar@redhat.com>
Date: Thu, 30 Nov 2023 05:31:05 +0000 (+0530)
Subject: qa/cephfs: try usual umount if client blocklisting cannot be inferred
X-Git-Tag: testing/wip-pdonnell-testing-20240430.123648-reef-debug~401^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3d0a927ecf530ba7ef1d2636afc282af7c44435c;p=ceph-ci.git

qa/cephfs: try usual umount if client blocklisting cannot be inferred

Signed-off-by: Venky Shankar <vshankar@redhat.com>
---

diff --git a/qa/tasks/cephfs/mount.py b/qa/tasks/cephfs/mount.py
index 49399088921..4a81874068f 100644
--- a/qa/tasks/cephfs/mount.py
+++ b/qa/tasks/cephfs/mount.py
@@ -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: