From: Joao Eduardo Luis <joao@suse.de>
Date: Wed, 24 Jun 2015 23:12:33 +0000 (+0100)
Subject: mon: Monitor: drop PaxoServiceMessage reply functions
X-Git-Tag: v9.1.0~535^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1b39f7d263cd20464bc68c970332baf095f20bc2;p=ceph.git

mon: Monitor: drop PaxoServiceMessage reply functions

The services are now fully using MonOpRequest and should stay that way.
Drop PaxosService-specific reply functions as we want nothing to do with
them :)

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
---

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 774793f93c5b..118ecede00da 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -3223,34 +3223,6 @@ void Monitor::send_reply(MonOpRequestRef op, Message *reply)
   session->put();
 }
 
-
-void Monitor::send_reply(PaxosServiceMessage *req, Message *reply)
-{
-  ConnectionRef connection = req->get_connection();
-  if (!connection) {
-    dout(2) << "send_reply no connection, dropping reply " << *reply
-	    << " to " << req << " " << *req << dendl;
-    reply->put();
-    return;
-  }
-  MonSession *session = static_cast<MonSession*>(connection->get_priv());
-  if (!session) {
-    dout(2) << "send_reply no session, dropping reply " << *reply
-	    << " to " << req << " " << *req << dendl;
-    reply->put();
-    return;
-  }
-  if (session->proxy_con) {
-    dout(15) << "send_reply routing reply to " << req->get_connection()->get_peer_addr()
-	     << " via " << session->proxy_con->get_peer_addr()
-	     << " for request " << *req << dendl;
-    session->proxy_con->send_message(new MRoute(session->proxy_tid, reply));
-  } else {
-    session->con->send_message(reply);
-  }
-  session->put();
-}
-
 void Monitor::no_reply(MonOpRequestRef op)
 {
   MonSession *session = op->get_session();
@@ -3284,30 +3256,6 @@ void Monitor::no_reply(MonOpRequestRef op)
   session->put();
 }
 
-void Monitor::no_reply(PaxosServiceMessage *req)
-{
-  MonSession *session = static_cast<MonSession*>(req->get_connection()->get_priv());
-  if (!session) {
-    dout(2) << "no_reply no session, dropping non-reply to " << req << " " << *req << dendl;
-    return;
-  }
-  if (session->proxy_con) {
-    if (get_quorum_features() & CEPH_FEATURE_MON_NULLROUTE) {
-      dout(10) << "no_reply to " << req->get_source_inst()
-	       << " via " << session->proxy_con->get_peer_addr()
-	       << " for request " << *req << dendl;
-      session->proxy_con->send_message(new MRoute(session->proxy_tid, NULL));
-    } else {
-      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 {
-    dout(10) << "no_reply to " << req->get_source_inst() << " " << *req << dendl;
-  }
-  session->put();
-}
-
 void Monitor::handle_route(MonOpRequestRef op)
 {
   MRoute *m = static_cast<MRoute*>(op->get_req());
diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h
index 48becbb5ef1b..8eae20f1510d 100644
--- a/src/mon/Monitor.h
+++ b/src/mon/Monitor.h
@@ -803,9 +803,7 @@ public:
   void forward_request_leader(MonOpRequestRef op);
   void handle_forward(MonOpRequestRef op);
   void try_send_message(Message *m, const entity_inst_t& to);
-  void send_reply(PaxosServiceMessage *req, Message *reply);
   void send_reply(MonOpRequestRef op, Message *reply);
-  void no_reply(PaxosServiceMessage *req);
   void no_reply(MonOpRequestRef op);
   void resend_routed_requests();
   void remove_session(MonSession *s);