]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
qa: skip internal metadata directory when scanning ceph debugfs directory 43420/head
authorVenky Shankar <vshankar@redhat.com>
Thu, 7 Oct 2021 04:40:13 +0000 (00:40 -0400)
committerVenky Shankar <vshankar@redhat.com>
Thu, 7 Oct 2021 04:40:13 +0000 (00:40 -0400)
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 <vshankar@redhat.com>
qa/tasks/cephfs/kernel_mount.py

index 55fdae5d9e84d205e4fca7bd4d73c7e78625b777..e8018eeec36406593053c30c7728b3fb19cc566d 100644 (file)
@@ -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('"')