mds: require filter for client/session evict command

This commit fixes the issues in client/session evict command
using below solutions:
(1) client evict without filter is forbidden
(2) SessionFilter::parse is modified to support id=* (id=0 is not allowed)
(3) Invalid id error is handled
User can use client evict id=* to evict all clients.

Fixes:  https://tracker.ceph.com/issues/58619
Signed-off-by: Neeraj Pratap Singh <neesingh@redhat.com>
(cherry picked from commit 0ef5941a2e79feeae79a705080b57d410fa38136)

diff --git a/src/mds/MDSDaemon.cc b/src/mds/MDSDaemon.cc
index 206daf9d5d8b33dcf341216e979c3209fb227cdb..b3a68e36b08442de3ef964852a470dd8ff45c0a2 100644 (file)
--- a/src/mds/MDSDaemon.cc
+++ b/src/mds/MDSDaemon.cc
@@ -408,11 +408,11 @@ void MDSDaemon::set_up_admin_socket()
                                     asok_hook,
                                     "List client sessions based on a filter");
   ceph_assert(r == 0);
-  r = admin_socket->register_command("session evict name=filters,type=CephString,n=N,req=false",
+  r = admin_socket->register_command("session evict name=filters,type=CephString,n=N,req=true",
                                     asok_hook,
                                     "Evict client session(s) based on a filter");
   ceph_assert(r == 0);
-  r = admin_socket->register_command("client evict name=filters,type=CephString,n=N,req=false",
+  r = admin_socket->register_command("client evict name=filters,type=CephString,n=N,req=true",
                                     asok_hook,
                                     "Evict client session(s) based on a filter");
   ceph_assert(r == 0);

diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc
index 80da7e7cd65c8dbfd349ec3e6cc0efb8b04fd148..c766e9ef1f982aa5ed29c0bfc44af68607d1f425 100644 (file)
--- a/src/mds/MDSRank.cc
+++ b/src/mds/MDSRank.cc
@@ -3135,7 +3135,7 @@ void MDSRankDispatcher::evict_clients(
   dout(20) << __func__ << " matched " << victims.size() << " sessions" << dendl;
 
   if (victims.empty()) {
-    on_finish(0, {}, outbl);
+    on_finish(-ESRCH, "no hosts match", outbl);
     return;
   }
 

diff --git a/src/mds/SessionMap.cc b/src/mds/SessionMap.cc
index 9bec67c245d61e7cb7c7d97b5ec029c9ea309529..48242f513b3999317dc61f2728c23bb113b8d829 100644 (file)
--- a/src/mds/SessionMap.cc
+++ b/src/mds/SessionMap.cc
@@ -1217,6 +1217,13 @@ int SessionFilter::parse(
       state = v;
     } else if (k == "id") {
       std::string err;
+      if (v == "*") {
+        // evict all clients , by default id set to 0
+        return 0;
+      } else if (v == "0") {
+        *ss << "Invalid value";
+        return -CEPHFS_EINVAL;
+      }
       id = strict_strtoll(v.c_str(), 10, &err);
       if (!err.empty()) {
         *ss << err;