]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
qa: update TestFlush for changed stray perf counters
authorJohn Spray <john.spray@redhat.com>
Fri, 3 Mar 2017 10:00:15 +0000 (10:00 +0000)
committerJohn Spray <john.spray@redhat.com>
Wed, 8 Mar 2017 10:27:03 +0000 (10:27 +0000)
Signed-off-by: John Spray <john.spray@redhat.com>
qa/tasks/cephfs/test_flush.py

index c83db08dcf1e70b37dfc7f838c22c3938ca13ef1..1f84e4200a399253e33be79ba303e50196383b5a 100644 (file)
@@ -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