From: John Spray <john.spray@redhat.com>
Date: Sun, 9 Apr 2017 17:13:29 +0000 (+0100)
Subject: qa/tasks/cephfs: update kernel_mount for debugfs format
X-Git-Tag: v12.0.2~40^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fb046b9730c54152bfd771443b02a6cc817c3773;p=ceph.git

qa/tasks/cephfs: update kernel_mount for debugfs format

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/qa/tasks/cephfs/kernel_mount.py b/qa/tasks/cephfs/kernel_mount.py
index 49f11d7c8978..105dd4025fae 100644
--- a/qa/tasks/cephfs/kernel_mount.py
+++ b/qa/tasks/cephfs/kernel_mount.py
@@ -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