RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-30 07:23:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

qa/cephfs: fallback to older way of get_op_read_count

Browse Source 
Fixes: https://tracker.ceph.com/issues/55538

Signed-off-by: Dhairya Parmar <dparmar@redhat.com>
This commit is contained in:
dparmar18 2022-05-23 14:45:40 +05:30
parent 48e9ada562
commit 0aca27d2fc
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
qa/tasks/cephfs/kernel_mount.py
View File

@ -1,3 +1,4 @@
import errno
import json
import logging
import os
@ -349,8 +350,23 @@ echo '{fdata}' | sudo tee /sys/kernel/debug/dynamic_debug/control
return epoch, barrier
def get_op_read_count(self):
buf = self.read_debug_file("metrics/size")
if buf is None:
return 0
else:
return int(re.findall(r'read.*', buf)[0].split()[1])
stdout = StringIO()
stderr = StringIO()
try:
path = os.path.join(self._get_debug_dir(), "metrics/size")
self.run_shell(f"sudo stat {path}", stdout=stdout,
stderr=stderr, cwd=None)
buf = self.read_debug_file("metrics/size")
except CommandFailedError:
if 'no such file or directory' in stderr.getvalue().lower() \
or 'not a directory' in stderr.getvalue().lower():
try:
path = os.path.join(self._get_debug_dir(), "metrics")
self.run_shell(f"sudo stat {path}", stdout=stdout,
stderr=stderr, cwd=None)
buf = self.read_debug_file("metrics")
except CommandFailedError:
return errno.ENOENT
else:
return 0
return int(re.findall(r'read.*', buf)[0].split()[1])

3
qa/tasks/cephfs/test_readahead.py
View File

@ -16,8 +16,7 @@ class TestReadahead(CephFSTestCase):
initial_op_read = self.mount_a.get_op_read_count()
self.mount_a.run_shell(["dd", "if=foo", "of=/dev/null", "bs=128k", "count=32"])
op_read = self.mount_a.get_op_read_count()
assert op_read >= initial_op_read
self.assertGreaterEqual(op_read, initial_op_read)
op_read -= initial_op_read
log.info("read operations: {0}".format(op_read))