]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
qa: extend rank 1 lockup for test_quiesce_authpin_wait 56923/head
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 16 Apr 2024 13:27:07 +0000 (09:27 -0400)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 16 Apr 2024 21:02:26 +0000 (17:02 -0400)
In teuthology, the lockup may not be long enough because clients are much
faster there than in a vstart cluster where this test was designed.

Fixes: https://tracker.ceph.com/issues/65508
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
qa/tasks/cephfs/test_quiesce.py

index bdb803e8c47fcb7f8d383041dfe5d858836226d8..32568b490378d86bcd32b905d1fd553849e31d72 100644 (file)
@@ -643,7 +643,8 @@ class TestQuiesceMultiRank(QuiesceTestCase):
         That a quiesce_inode op with outstanding remote authpin requests can be killed.
         """
 
-        self.config_set('mds', 'mds_heartbeat_grace', '60')
+        self.config_set('mds', 'mds_heartbeat_grace', '120')
+        self.fs.set_session_timeout(240) # avoid spurious session warnings
         self._configure_subvolume()
         self.mount_a.setfattr(".", "ceph.dir.pin.distributed", "1")
         self._client_background_workload()
@@ -653,8 +654,8 @@ class TestQuiesceMultiRank(QuiesceTestCase):
         p = self.mount_a.run_shell_payload("ls", stdout=StringIO())
         dirs = p.stdout.getvalue().strip().split()
 
-        # make rank 0 unresponsive to auth pin requests
-        p = self.run_ceph_cmd("tell", f"mds.{self.fs.id}:1", "lockup", "30000", wait=False)
+        # make rank 1 unresponsive to auth pin requests
+        p = self.run_ceph_cmd("tell", f"mds.{self.fs.id}:1", "lockup", "90000", wait=False)
 
         qops = []
         for d in dirs:
@@ -692,7 +693,7 @@ class TestQuiesceMultiRank(QuiesceTestCase):
 
         # verify some quiesce_inode ops still exist because authpin acks have not been received
         if not find_quiesce(True):
-            self.fail("did not find quiesce_inode op blocked on remote authpins!")
+            self.fail("did not find quiesce_inode op blocked on remote authpins! (did the lockup on rank 1 complete?)")
 
         # wait for sleep to complete
         p.wait()