From: Venky Shankar Date: Thu, 7 Oct 2021 04:40:13 +0000 (-0400) Subject: qa: skip internal metadata directory when scanning ceph debugfs directory X-Git-Tag: v17.1.0~674^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ff88d7de52b347486a626375816fc119ee8fd72f;p=ceph.git qa: skip internal metadata directory when scanning ceph debugfs directory kclient patchset https://patchwork.kernel.org/project/ceph-devel/list/?series=556049 introduces `meta` directory to add debugging entries. This needs to be filtered when scanning ceph debugfs directory. Fixes: https://tracker.ceph.com/issues/52824 Signed-off-by: Venky Shankar --- diff --git a/qa/tasks/cephfs/kernel_mount.py b/qa/tasks/cephfs/kernel_mount.py index 55fdae5d9e8..e8018eeec36 100644 --- a/qa/tasks/cephfs/kernel_mount.py +++ b/qa/tasks/cephfs/kernel_mount.py @@ -16,7 +16,8 @@ log = logging.getLogger(__name__) UMOUNT_TIMEOUT = 300 - +# internal metadata directory +DEBUGFS_META_DIR = 'meta' class KernelMount(CephFSMount): def __init__(self, ctx, test_dir, client_id, client_remote, @@ -200,6 +201,8 @@ class KernelMount(CephFSMount): def get_id_to_dir(): result = {} for dir in glob.glob("/sys/kernel/debug/ceph/*"): + if os.path.basename(dir) == DEBUGFS_META_DIR: + continue mds_sessions_lines = open(os.path.join(dir, "mds_sessions")).readlines() global_id = mds_sessions_lines[0].split()[1].strip('"') client_id = mds_sessions_lines[1].split()[1].strip('"')