From 4277cd298977c606609b90e2c2fa367cce97ae5a Mon Sep 17 00:00:00 2001 From: Venky Shankar Date: Thu, 19 Sep 2024 06:27:53 +0000 Subject: [PATCH] mds: invalid id for client eviction is to be treated as success Introduced-by: 0ef5941a2e79 Fixes: http://tracker.ceph.com/issues/68132 Signed-off-by: Venky Shankar --- qa/tasks/cephfs/test_misc.py | 14 ++++++++------ src/mds/MDSRank.cc | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/qa/tasks/cephfs/test_misc.py b/qa/tasks/cephfs/test_misc.py index 7917bd9202fc6..14f54a784e793 100644 --- a/qa/tasks/cephfs/test_misc.py +++ b/qa/tasks/cephfs/test_misc.py @@ -558,16 +558,18 @@ class TestSessionClientEvict(CephFSTestCase): self.assertEqual(ce.exception.exitstatus, errno.EINVAL) def _evict_with_invalid_id(self, cmd): + info_initial = self.fs.rank_asok(cmd + ['ls']) # with invalid id - with self.assertRaises(CommandFailedError) as ce: - self.fs.rank_tell(cmd + ['evict', 'id=1']) - self.assertEqual(ce.exception.exitstatus, errno.ESRCH) + self.fs.rank_tell(cmd + ['evict', 'id=1']) + info = self.fs.rank_asok(cmd + ['ls']) + self.assertEqual(len(info), len(info_initial)) # session list is status-quo def _evict_with_negative_id(self, cmd): + info_initial = self.fs.rank_asok(cmd + ['ls']) # with negative id - with self.assertRaises(CommandFailedError) as ce: - self.fs.rank_tell(cmd + ['evict', 'id=-9']) - self.assertEqual(ce.exception.exitstatus, errno.ESRCH) + self.fs.rank_tell(cmd + ['evict', 'id=-9']) + info = self.fs.rank_asok(cmd + ['ls']) + self.assertEqual(len(info), len(info_initial)) # session list is status-quo def _evict_with_valid_id(self, cmd): info_initial = self.fs.rank_asok(cmd + ['ls']) diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc index 50c7175df804a..f6665cf42d821 100644 --- a/src/mds/MDSRank.cc +++ b/src/mds/MDSRank.cc @@ -3149,7 +3149,7 @@ void MDSRankDispatcher::evict_clients( dout(20) << __func__ << " matched " << victims.size() << " sessions" << dendl; if (victims.empty()) { - on_finish(-ESRCH, "no hosts match", outbl); + on_finish(0, "no hosts match", outbl); return; } -- 2.39.5