mds: add counter for tracking cap non-responding clients

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 8f2de92712a98568b0d07a795f1158868caae550)

Conflicts:
	src/mds/Server.cc
	src/mds/Server.h

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 167a11e98c4ffdc9dcb5271256109127dce18f2e..3f4a74e0a9596ecb849d7fc3aaca611888543dd4 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -178,6 +178,9 @@ void Server::create_logger()
   plb.add_time_avg(l_mdss_req_renamesnap_latency, "req_renamesnap_latency",
                    "Request type rename snapshot latency");
 
+  plb.add_u64_counter(l_mdss_cap_revoke_eviction, "cap_revoke_eviction",
+                      "Cap Revoke Client Eviction", "cre", PerfCountersBuilder::PRIO_INTERESTING);
+
   plb.set_prio_default(PerfCountersBuilder::PRIO_DEBUGONLY);
   plb.add_u64_counter(l_mdss_dispatch_client_request, "dispatch_client_request",
                       "Client requests dispatched");
@@ -817,8 +820,12 @@ void Server::evict_cap_revoke_non_responders() {
             << client << dendl;
 
     std::stringstream ss;
-    mds->evict_client(client.v, false, g_conf->mds_session_blacklist_on_evict,
-                      ss, nullptr);
+    bool evicted = mds->evict_client(client.v, false,
+                                     g_conf->mds_session_blacklist_on_evict,
+                                     ss, nullptr);
+    if (evicted && logger) {
+      logger->inc(l_mdss_cap_revoke_eviction);
+    }
   }
 }
 

diff --git a/src/mds/Server.h b/src/mds/Server.h
index 80b973ed619d9800c410f7c91e30812948ba1f20..cd8a30820631efe2d193fc8dacb3545c6ff9525b 100644 (file)
--- a/src/mds/Server.h
+++ b/src/mds/Server.h
@@ -66,6 +66,7 @@ enum {
   l_mdss_req_setxattr_latency,
   l_mdss_req_symlink_latency,
   l_mdss_req_unlink_latency,
+  l_mdss_cap_revoke_eviction,
   l_mdss_last,
 };