mon: mark PaxosServiceMessage forward fields deprecated

These are no longer used; we manage forward state explicitly via the
Monitor sessions instead.  Mark them deprecated so we don't accidentally
rely on them.  Also, fix the annoying "mon.-1" garbage debug output that
is confusing.

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

diff --git a/src/messages/PaxosServiceMessage.h b/src/messages/PaxosServiceMessage.h
index 5132e1c99051043678a679d2c137b0f9adaf3b6d..285804f2b94dae22536568b62da7c53745b5253c 100644 (file)
--- a/src/messages/PaxosServiceMessage.h
+++ b/src/messages/PaxosServiceMessage.h
@@ -7,8 +7,8 @@
 class PaxosServiceMessage : public Message {
  public:
   version_t version;
-  __s16 session_mon;
-  uint64_t session_mon_tid;
+  __s16 deprecated_session_mon;
+  uint64_t deprecated_session_mon_tid;
 
   // track which epoch the leader received a forwarded request in, so we can
   // discard forwarded requests appropriately on election boundaries.
@@ -16,11 +16,11 @@ class PaxosServiceMessage : public Message {
   
   PaxosServiceMessage()
     : Message(MSG_PAXOS),
-      version(0), session_mon(-1), session_mon_tid(0),
+      version(0), deprecated_session_mon(-1), deprecated_session_mon_tid(0),
       rx_election_epoch(0) { }
   PaxosServiceMessage(int type, version_t v, int enc_version=1, int compat_enc_version=0)
     : Message(type, enc_version, compat_enc_version),
-      version(v), session_mon(-1), session_mon_tid(0),
+      version(v), deprecated_session_mon(-1), deprecated_session_mon_tid(0),
       rx_election_epoch(0)  { }
  protected:
   ~PaxosServiceMessage() {}
@@ -28,14 +28,14 @@ class PaxosServiceMessage : public Message {
  public:
   void paxos_encode() {
     ::encode(version, payload);
-    ::encode(session_mon, payload);
-    ::encode(session_mon_tid, payload);
+    ::encode(deprecated_session_mon, payload);
+    ::encode(deprecated_session_mon_tid, payload);
   }
 
   void paxos_decode( bufferlist::iterator& p ) {
     ::decode(version, p);
-    ::decode(session_mon, p);
-    ::decode(session_mon_tid, p);
+    ::decode(deprecated_session_mon, p);
+    ::decode(deprecated_session_mon_tid, p);
   }
 
   void encode_payload(uint64_t features) {

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 0d2b8322b78460accf5d1ab8b1432af42296e02d..c2cde236de257d04f0e5f2bbec2154ebfc0d8f36 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -2870,7 +2870,7 @@ void Monitor::send_reply(PaxosServiceMessage *req, Message *reply)
   }
   if (session->proxy_con) {
     dout(15) << "send_reply routing reply to " << req->get_connection()->get_peer_addr()
-            << " via mon" << req->session_mon
+            << " via " << session->proxy_con->get_peer_addr()
             << " for request " << *req << dendl;
     messenger->send_message(new MRoute(session->proxy_tid, reply),
                            session->proxy_con);    
@@ -2889,12 +2889,14 @@ void Monitor::no_reply(PaxosServiceMessage *req)
   }
   if (session->proxy_con) {
     if (get_quorum_features() & CEPH_FEATURE_MON_NULLROUTE) {
-      dout(10) << "no_reply to " << req->get_source_inst() << " via mon." << req->session_mon
+      dout(10) << "no_reply to " << req->get_source_inst()
+              << " via " << session->proxy_con->get_peer_addr()
               << " for request " << *req << dendl;
       messenger->send_message(new MRoute(session->proxy_tid, NULL),
                              session->proxy_con);
     } else {
-      dout(10) << "no_reply no quorum nullroute feature for " << req->get_source_inst() << " via mon." << req->session_mon
+      dout(10) << "no_reply no quorum nullroute feature for " << req->get_source_inst()
+              << " via " << session->proxy_con->get_peer_addr()
               << " for request " << *req << dendl;
     }
   } else {