mon: print caps to debug log

diff --git a/src/mon/MonCaps.cc b/src/mon/MonCaps.cc
index ae677a5be3217962d81760c5d3db373d1267674a..3a4a6d3af02aaf6a4912e86140d626b26cac0db3 100644 (file)
--- a/src/mon/MonCaps.cc
+++ b/src/mon/MonCaps.cc
@@ -87,6 +87,7 @@ bool MonCaps::parse(bufferlist::iterator& iter)
 
   try {
     ::decode(s, iter);
+    text = s;
 
     generic_dout(0) << "decoded caps: " << s << dendl;
 

diff --git a/src/mon/MonCaps.h b/src/mon/MonCaps.h
index 8fbc6a9fe6c493c4298fc7c384dc59da8e31e157..7d8d18ae872afc74689d5c5f045f41bc2994e7b7 100644 (file)
--- a/src/mon/MonCaps.h
+++ b/src/mon/MonCaps.h
@@ -34,6 +34,7 @@ struct MonServiceCap {
 };
 
 class MonCaps {
+  string text;
   rwx_t default_action;
   map<int, MonServiceCap> services_map;
   bool get_next_token(string s, size_t& pos, string& token);
@@ -42,6 +43,7 @@ class MonCaps {
   bool allow_all;
 public:
   MonCaps() : default_action(0), allow_all(false) {}
+  const string& get_str() { return text; }
   bool parse(bufferlist::iterator& iter);
   rwx_t get_caps(int service);
   void set_allow_all(bool allow) { allow_all = allow; }

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 7d62d4b87384bd935f43537e49621bb2c4865d21..79009a591e4e6adb28c8dc8d3c9cb4d4a2f314ad 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -537,6 +537,10 @@ bool Monitor::ms_dispatch(Message *m)
     }
   }
   src_is_mon = !connection || (connection->get_peer_type() & CEPH_ENTITY_TYPE_MON);
+
+  if (s)
+    dout(20) << " caps " << s->caps.get_str() << dendl;
+
 #define ALLOW_CAPS(service_id, allow_caps) \
 do { \
   if (src_is_mon) \