From fb046b9730c54152bfd771443b02a6cc817c3773 Mon Sep 17 00:00:00 2001 From: John Spray Date: Sun, 9 Apr 2017 18:13:29 +0100 Subject: [PATCH] qa/tasks/cephfs: update kernel_mount for debugfs format Signed-off-by: John Spray --- qa/tasks/cephfs/kernel_mount.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) 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 -- 2.47.3