]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
qa: correct usage of DEBUGFS_META_DIR in dedent
authorVenky Shankar <vshankar@redhat.com>
Wed, 15 Nov 2023 15:21:47 +0000 (20:51 +0530)
committerVenky Shankar <vshankar@redhat.com>
Wed, 13 Mar 2024 13:47:59 +0000 (19:17 +0530)
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 334cdaf28616631ecb9ca1c94a070fcbb7dee729)

qa/tasks/cephfs/kernel_mount.py

index 89f6b66398c9b2481daed0acc974fe04a4d0887a..83ca08c7aa5a7bf93abe6acf59e25d4161f52b13 100644 (file)
@@ -260,9 +260,10 @@ class KernelMount(CephFSMount):
                 import json
 
                 def get_id_to_dir():
-                    result = {}
+                    meta_dir = "{meta_dir}"
+                    result = dict()
                     for dir in glob.glob("/sys/kernel/debug/ceph/*"):
-                        if os.path.basename(dir) == DEBUGFS_META_DIR:
+                        if os.path.basename(dir) == meta_dir:
                             continue
                         mds_sessions_lines = open(os.path.join(dir, "mds_sessions")).readlines()
                         global_id = mds_sessions_lines[0].split()[1].strip('"')
@@ -270,7 +271,7 @@ class KernelMount(CephFSMount):
                         result[client_id] = global_id
                     return result
                 print(json.dumps(get_id_to_dir()))
-            """)
+            """.format(meta_dir=DEBUGFS_META_DIR))
 
             output = self.client_remote.sh([
                 'sudo', 'python3', '-c', pyscript