update sources to v12.1.0

[ceph.git] / ceph / src / mds / MDSDaemon.cc

diff --git a/ceph/src/mds/MDSDaemon.cc b/ceph/src/mds/MDSDaemon.cc
index 4c3d558ed46b9f899034c706f29e68efc61439bd..29aa5c2ce178c7eba043d0995d3c48c106f6c53c 100644 (file)
--- a/ceph/src/mds/MDSDaemon.cc
+++ b/ceph/src/mds/MDSDaemon.cc
@@ -661,9 +661,15 @@ COMMAND("cpu_profiler " \
 COMMAND("session ls " \
        "name=filters,type=CephString,n=N,req=false",
        "List client sessions", "mds", "r", "cli,rest")
+COMMAND("client ls " \
+       "name=filters,type=CephString,n=N,req=false",
+       "List client sessions", "mds", "r", "cli,rest")
 COMMAND("session evict " \
        "name=filters,type=CephString,n=N,req=false",
        "Evict client session(s)", "mds", "rw", "cli,rest")
+COMMAND("client evict " \
+       "name=filters,type=CephString,n=N,req=false",
+       "Evict client session(s)", "mds", "rw", "cli,rest")
 COMMAND("damage ls",
        "List detected metadata damage", "mds", "r", "cli,rest")
 COMMAND("damage rm name=damage_id,type=CephInt",
@@ -774,7 +780,9 @@ int MDSDaemon::_handle_command(
     int64_t session_id = 0;
     bool got = cmd_getval(cct, cmdmap, "session_id", session_id);
     assert(got);
-    bool killed = mds_rank->kill_session(session_id, false, ss);
+    bool killed = mds_rank->evict_client(session_id, false,
+                                         g_conf->mds_session_blacklist_on_evict,
+                                         ss);
     if (!killed)
       r = -ENOENT;
   } else if (prefix == "heap") {