From 4672934a6dbdc26e51931060d0e794a06b73ca29 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Tue, 16 Apr 2024 09:27:07 -0400 Subject: [PATCH] qa: extend rank 1 lockup for test_quiesce_authpin_wait 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 (cherry picked from commit 0f7c3c48dff97aed2722f605e90745ed46898596) --- qa/tasks/cephfs/test_quiesce.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/qa/tasks/cephfs/test_quiesce.py b/qa/tasks/cephfs/test_quiesce.py index bdb803e8c47fc..32568b490378d 100644 --- a/qa/tasks/cephfs/test_quiesce.py +++ b/qa/tasks/cephfs/test_quiesce.py @@ -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() -- 2.39.5