From: Jeff Layton <jlayton@redhat.com>
Date: Wed, 10 Nov 2021 18:10:50 +0000 (-0500)
Subject: qa: account for split of the kclient "metrics" debugfs file
X-Git-Tag: v15.2.16~39^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F44270%2Fhead;p=ceph.git

qa: account for split of the kclient "metrics" debugfs file

Recently, Luis posted a patch to turn the metrics debugfs file into a
directory with separate files for the different sections in the old
metrics file.

Account for this change in get_op_read_count().

Fixes: https://tracker.ceph.com/issues/53214
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit e9f2bff8cd7df1c81ff8bbfa2530f470d9c6af2c)
---

diff --git a/qa/tasks/cephfs/kernel_mount.py b/qa/tasks/cephfs/kernel_mount.py
index 1d35545c60e44..e25f51bd26887 100644
--- a/qa/tasks/cephfs/kernel_mount.py
+++ b/qa/tasks/cephfs/kernel_mount.py
@@ -263,7 +263,7 @@ class KernelMount(CephFSMount):
         return epoch, barrier
 
     def get_op_read_count(self):
-        buf = self.read_debug_file("metrics")
+        buf = self.read_debug_file("metrics/size")
         if buf is None:
             return 0
         else: