From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 15 Jan 2020 01:52:28 +0000 (-0800)
Subject: qa: ignore trimmed cache items for dead cache drop
X-Git-Tag: v15.1.0~108^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F32644%2Fhead;p=ceph.git

qa: ignore trimmed cache items for dead cache drop

Fixes: https://tracker.ceph.com/issues/42986
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/qa/suites/fs/multiclient/tasks/cephfs_misc_tests.yaml b/qa/suites/fs/multiclient/tasks/cephfs_misc_tests.yaml
index 90ae385897a..564989d6d76 100644
--- a/qa/suites/fs/multiclient/tasks/cephfs_misc_tests.yaml
+++ b/qa/suites/fs/multiclient/tasks/cephfs_misc_tests.yaml
@@ -9,3 +9,5 @@ overrides:
       - evicting unresponsive client
       - POOL_APP_NOT_ENABLED
       - has not responded to cap revoke by MDS for over
+      - MDS_CLIENT_LATE_RELEASE
+      - responding to mclientcaps
diff --git a/qa/tasks/cephfs/test_misc.py b/qa/tasks/cephfs/test_misc.py
index b21faa423b0..342fb76d4db 100644
--- a/qa/tasks/cephfs/test_misc.py
+++ b/qa/tasks/cephfs/test_misc.py
@@ -257,7 +257,12 @@ class TestCacheDrop(CephFSTestCase):
         self.assertEqual(result['flush_journal']['return_code'], 0)
         self.assertGreater(result['duration'], 5)
         self.assertLess(result['duration'], 120)
-        self.assertEqual(0, result['trim_cache']['trimmed'])
+        # Note: result['trim_cache']['trimmed'] may be >0 because dropping the
+        # cache now causes the Locker to drive eviction of stale clients (a
+        # stale session will be autoclosed at mdsmap['session_timeout']). The
+        # particular operation causing this is journal flush which causes the
+        # MDS to wait wait for cap revoke.
+        #self.assertEqual(0, result['trim_cache']['trimmed'])
         self.mount_a.kill_cleanup()
         self.mount_a.mount()
         self.mount_a.wait_until_mounted()
@@ -275,7 +280,11 @@ class TestCacheDrop(CephFSTestCase):
         self.assertEqual(result['flush_journal']['return_code'], 0)
         self.assertGreater(result['duration'], 5)
         self.assertLess(result['duration'], 120)
-        self.assertEqual(0, result['trim_cache']['trimmed'])
+        # Note: result['trim_cache']['trimmed'] may be >0 because dropping the
+        # cache now causes the Locker to drive eviction of stale clients (a
+        # stale session will be autoclosed at mdsmap['session_timeout']). The
+        # particular operation causing this is journal flush which causes the
+        # MDS to wait wait for cap revoke.
         self.mount_a.kill_cleanup()
         self.mount_a.mount()
         self.mount_a.wait_until_mounted()