]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/tasks/cephfs: update kernel_mount for debugfs format 14396/head
authorJohn Spray <john.spray@redhat.com>
Sun, 9 Apr 2017 17:13:29 +0000 (18:13 +0100)
committerJohn Spray <john.spray@redhat.com>
Sun, 9 Apr 2017 17:13:29 +0000 (18:13 +0100)
Signed-off-by: John Spray <john.spray@redhat.com>
qa/tasks/cephfs/kernel_mount.py

index 49f11d7c897898052acd3c898252c12782101839..105dd4025faeb1a03042d5bb66b55d2ff5c738d4 100644 (file)
@@ -251,10 +251,7 @@ class KernelMount(CephFSMount):
         """
         osd_map = self._read_debug_file("osdmap")
         lines = osd_map.split("\n")
-        epoch = int(lines[0].split()[1])
+        first_line_tokens = lines[0].split()
+        epoch, barrier = int(first_line_tokens[1]), int(first_line_tokens[3])
 
-        mds_sessions = self._read_debug_file("mds_sessions")
-        lines = mds_sessions.split("\n")
-        epoch_barrier = int(lines[2].split()[1].strip('"'))
-
-        return epoch, epoch_barrier
+        return epoch, barrier