From 6356a135230644aedb1aa4030e7995a37d72dabb Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Wed, 30 May 2018 14:36:08 -0500
Subject: [PATCH] messages/MRoute: remove unused entity_inst_t dest

This is unused in luminous and mimic, too, although the code was
never removed.

Signed-off-by: Sage Weil <sage@redhat.com>
---
 src/messages/MRoute.h        | 17 +++++------------
 src/mon/Monitor.cc           | 11 ++++-------
 src/test/mon/test-mon-msg.cc |  2 --
 3 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/src/messages/MRoute.h b/src/messages/MRoute.h
index c97c2eded41..7df923e13b8 100644
--- a/src/messages/MRoute.h
+++ b/src/messages/MRoute.h
@@ -27,7 +27,6 @@ struct MRoute : public Message {
 
   uint64_t session_mon_tid;
   Message *msg;
-  entity_inst_t dest;
   epoch_t send_osdmap_first;
   
   MRoute() : Message(MSG_ROUTE, HEAD_VERSION, COMPAT_VERSION),
@@ -39,14 +38,6 @@ struct MRoute : public Message {
       session_mon_tid(t),
       msg(m),
       send_osdmap_first(0) {}
-  MRoute(bufferlist bl, const entity_inst_t& i)
-    : Message(MSG_ROUTE, HEAD_VERSION, COMPAT_VERSION),
-      session_mon_tid(0),
-      dest(i),
-      send_osdmap_first(0) {
-    auto p = bl.cbegin();
-    msg = decode_message(NULL, 0, p);
-  }
 private:
   ~MRoute() override {
     if (msg)
@@ -57,7 +48,8 @@ public:
   void decode_payload() override {
     auto p = payload.cbegin();
     decode(session_mon_tid, p);
-    decode(dest, p);
+    entity_inst_t dest_unused;
+    decode(dest_unused, p);
     bool m;
     decode(m, p);
     if (m)
@@ -67,7 +59,8 @@ public:
   void encode_payload(uint64_t features) override {
     using ceph::encode;
     encode(session_mon_tid, payload);
-    encode(dest, payload, features);
+    entity_inst_t dest_unused;
+    encode(dest_unused, payload, features);
     bool m = msg ? true : false;
     encode(m, payload);
     if (msg)
@@ -86,7 +79,7 @@ public:
     if (session_mon_tid)
       o << " tid " << session_mon_tid << ")";
     else
-      o << " to " << dest << ")";
+      o << " tid (none)";
   }
 };
 
diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index cf526e22f61..f0a430ec290 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -3840,9 +3840,10 @@ void Monitor::handle_route(MonOpRequestRef op)
     return;
   }
   if (m->msg)
-    dout(10) << "handle_route " << *m->msg << " to " << m->dest << dendl;
+    dout(10) << "handle_route tid " << m->session_mon_tid << " " << *m->msg
+	     << dendl;
   else
-    dout(10) << "handle_route null to " << m->dest << dendl;
+    dout(10) << "handle_route tid " << m->session_mon_tid << " null" << dendl;
   
   // look it up
   if (m->session_mon_tid) {
@@ -3868,11 +3869,7 @@ void Monitor::handle_route(MonOpRequestRef op)
       dout(10) << " don't have routed request tid " << m->session_mon_tid << dendl;
     }
   } else {
-    dout(10) << " not a routed request, trying to send anyway" << dendl;
-    if (m->msg) {
-      messenger->send_message(m->msg, m->dest);
-      m->msg = NULL;
-    }
+    dout(10) << " not a routed request, ignoring" << dendl;
   }
 }
 
diff --git a/src/test/mon/test-mon-msg.cc b/src/test/mon/test-mon-msg.cc
index bb2c4638a65..f033e859af1 100644
--- a/src/test/mon/test-mon-msg.cc
+++ b/src/test/mon/test-mon-msg.cc
@@ -301,8 +301,6 @@ TEST_F(MonMsgTest, MRouteTest)
   Message *payload = new MGenericMessage(CEPH_MSG_SHUTDOWN);
   MRoute *m = new MRoute;
   m->msg = payload;
-  m->dest.addr = msg->get_myaddr();
-  m->dest.name = entity_name_t(msg->get_mytype(), -1);
   Message *r = send_wait_reply(m, CEPH_MSG_SHUTDOWN);
   // we want an error
   ASSERT_NE(IS_ERR(r), 0);
-- 
2.39.5