From: John Spray Date: Fri, 3 Mar 2017 10:00:15 +0000 (+0000) Subject: qa: update TestFlush for changed stray perf counters X-Git-Tag: v12.0.1~140^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1a1951002d8c2f025dbb2c2beb55e6b6401f27dd;p=ceph.git qa: update TestFlush for changed stray perf counters Signed-off-by: John Spray --- diff --git a/qa/tasks/cephfs/test_flush.py b/qa/tasks/cephfs/test_flush.py index c83db08dcf1e..1f84e4200a39 100644 --- a/qa/tasks/cephfs/test_flush.py +++ b/qa/tasks/cephfs/test_flush.py @@ -85,7 +85,7 @@ class TestFlush(CephFSTestCase): # We will count the RADOS deletions and MDS file purges, to verify that # the expected behaviour is happening as a result of the purge initial_dels = self.fs.mds_asok(['perf', 'dump', 'objecter'])['objecter']['osdop_delete'] - initial_purges = self.fs.mds_asok(['perf', 'dump', 'mds_cache'])['mds_cache']['strays_purged'] + initial_purges = self.fs.mds_asok(['perf', 'dump', 'mds_cache'])['mds_cache']['strays_enqueued'] # Use a client to delete a file self.mount_a.mount() @@ -98,7 +98,7 @@ class TestFlush(CephFSTestCase): # We expect to see a single file purge self.wait_until_true( - lambda: self.fs.mds_asok(['perf', 'dump', 'mds_cache'])['mds_cache']['strays_purged'] - initial_purges >= 2, + lambda: self.fs.mds_asok(['perf', 'dump', 'mds_cache'])['mds_cache']['strays_enqueued'] - initial_purges >= 2, 60) # We expect two deletions, one of the dirfrag and one of the backtrace