Merge pull request ceph#57458 from lxbsz/wip-session-evict

qa/cephfs: add test_session_evict_non_blocklisted test case

Reviewed-by: Venky Shankar <[email protected]>

Author: vshankar

qa/tasks/cephfs/test_sessionmap.py

@@ -230,3 +230,46 @@ def test_session_evict_blocklisted(self):
 
         self.mount_a.kill_cleanup()
         self.mount_a.mount_wait()
+
+    def test_session_evict_non_blocklisted(self):
+        """
+        Check that mds evicts without blocklisting client
+        """
+
+        self.config_set('mds', 'mds_session_blocklist_on_evict', False)
+        self.fs.set_max_mds(2)
+        status = self.fs.wait_for_daemons()
+
+        self.fs.set_ceph_conf('client', 'client reconnect stale', True)
+        self.mount_a.remount()
+        self.mount_b.remount()
+
+        self.mount_a.run_shell_payload("mkdir {d0,d1} && touch {d0,d1}/file")
+        self.mount_a.setfattr("d0", "ceph.dir.pin", "0")
+        self.mount_a.setfattr("d1", "ceph.dir.pin", "1")
+        self._wait_subtrees([('/d0', 0), ('/d1', 1)], status=status)
+
+        self.mount_a.run_shell(["touch", "d0/f0"])
+        self.mount_a.run_shell(["touch", "d1/f0"])
+        self.mount_b.run_shell(["touch", "d0/f1"])
+        self.mount_b.run_shell(["touch", "d1/f1"])
+
+        self.assert_session_count(2, mds_id=self.fs.get_rank(rank=0, status=status)['name'])
+        self.assert_session_count(2, mds_id=self.fs.get_rank(rank=1, status=status)['name'])
+
+        mount_a_client_id = self.mount_a.get_global_id()
+        self.fs.mds_asok(['session', 'evict', "%s" % mount_a_client_id],
+                         mds_id=self.fs.get_rank(rank=0, status=status)['name'])
+
+        self.mount_a.run_shell(["touch", "d0/f00"])
+        self.mount_a.run_shell(["touch", "d1/f00"])
+        self.mount_b.run_shell(["touch", "d0/f10"])
+        self.mount_b.run_shell(["touch", "d1/f10"])
+
+        # 10 seconds should be enough for reconnecting the sessions
+        time.sleep(10)
+        self.assert_session_count(2, mds_id=self.fs.get_rank(rank=0, status=status)['name'])
+        self.assert_session_count(2, mds_id=self.fs.get_rank(rank=1, status=status)['name'])
+
+        self.mount_a.kill_cleanup()
+        self.mount_a.mount_wait()

src/mds/Server.cc

@@ -1535,7 +1535,7 @@ void Server::handle_client_reconnect(const cref_t<MClientReconnect> &m)
   }
 
   if (!session->is_open()) {
-    dout(0) << " ignoring msg from not-open session" << *m << dendl;
+    dout(0) << " ignoring msg from not-open session " << *m << dendl;
     auto reply = make_message<MClientSession>(CEPH_SESSION_CLOSE);
     mds->send_message(reply, m->get_connection());
     return;