From: Sage Weil <sage@inktank.com>
Date: Sat, 1 Jun 2013 00:48:04 +0000 (-0700)
Subject: mon: better debugging of caps messages/values
X-Git-Tag: v0.65~136^2^2~29
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d4bfce7ca0079b0e293bed05cc77ab9fd3309595;p=ceph.git

mon: better debugging of caps messages/values

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/messages/MForward.h b/src/messages/MForward.h
index 7c12e061b7c4..7c88aba8964a 100644
--- a/src/messages/MForward.h
+++ b/src/messages/MForward.h
@@ -64,7 +64,7 @@ public:
   const char *get_type_name() const { return "forward"; }
   void print(ostream& o) const {
     if (msg)
-      o << "forward(" << *msg << ") to leader";
+      o << "forward(" << *msg << " caps " << client_caps << ") to leader";
     else o << "forward(??? ) to leader";
   }
 };
diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 1e8688e226ae..a7f78f5dd32d 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -176,7 +176,8 @@ Monitor::Monitor(CephContext* cct_, string nm, MonitorDBStore *s,
   config_key_service = ConfigKeyServiceRef(new ConfigKeyService(this, paxos));
 
   mon_caps = new MonCap();
-  mon_caps->parse("allow *", NULL);
+  bool r = mon_caps->parse("allow *", NULL);
+  assert(r);
 
   exited_quorum = ceph_clock_now(g_ceph_context);
 }
@@ -2943,6 +2944,7 @@ void Monitor::handle_forward(MForward *m)
     c->set_peer_type(m->client.name.type());
 
     s->caps = m->client_caps;
+    dout(10) << " caps are " << s->caps << dendl;
     s->proxy_con = m->get_connection()->get();
     s->proxy_tid = m->tid;