From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 12 Dec 2018 23:33:35 +0000 (-0800)
Subject: mds: log evicted clients to clog/dbg
X-Git-Tag: v12.2.12~77^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ce61c845619a9b7ed2a9bc6c63cabb670964f678;p=ceph.git

mds: log evicted clients to clog/dbg

Fixes: http://tracker.ceph.com/issues/37639
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 7a81421453f76c6a67f28f749f1489737f7b58c5)

Conflicts:
	src/mds/MDSRank.cc
	  - Used 'std::stringstream' instead of 'CachedStackStringStream'
	    and repllaced the 'ss.strv()' to 'ss.str()'.
---

diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc
index b196b5044ba..be0a167dc7f 100644
--- a/src/mds/MDSRank.cc
+++ b/src/mds/MDSRank.cc
@@ -3072,11 +3072,20 @@ bool MDSRank::evict_client(int64_t session_id,
     return false;
   }
 
+  auto& addr = session->info.inst.addr;
+  {
+    std::stringstream ss;
+    ss << "Evicting " << (blacklist ? "(and blacklisting) " : "")
+       << "client session " << session_id << " (" << addr << ")";
+    dout(1) << ss.str() << dendl;
+    clog->info() << ss.str();
+  }
+
   dout(4) << "Preparing blacklist command... (wait=" << wait << ")" << dendl;
   stringstream ss;
   ss << "{\"prefix\":\"osd blacklist\", \"blacklistop\":\"add\",";
   ss << "\"addr\":\"";
-  ss << session->info.inst.addr;
+  ss << addr;
   ss << "\"}";
   std::string tmp = ss.str();
   std::vector<std::string> cmd = {tmp};