From: Sage Weil <sage@redhat.com>
Date: Mon, 14 Jan 2019 20:17:47 +0000 (-0600)
Subject: msg/Messenger: remove get_connection() and send_message()
X-Git-Tag: v14.1.0~381^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F25947%2Fhead;p=ceph.git

msg/Messenger: remove get_connection() and send_message()

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

diff --git a/src/msg/Messenger.h b/src/msg/Messenger.h
index c075b7c0c76d2..07e536a83802e 100644
--- a/src/msg/Messenger.h
+++ b/src/msg/Messenger.h
@@ -445,10 +445,6 @@ public:
    *
    * @return 0 on success, or -errno on failure.
    */
-  virtual int send_message(Message *m, const entity_inst_t& dest) {
-    return send_to(m, dest.name.type(), entity_addrvec_t(dest.addr));
-  }
-
   virtual int send_to(
     Message *m,
     int type,
@@ -485,12 +481,6 @@ public:
    *
    * @param dest The entity to get a connection for.
    */
-  virtual ConnectionRef get_connection(const entity_inst_t& dest) {
-    // temporary
-    return connect_to(dest.name.type(),
-		      entity_addrvec_t(dest.addr));
-  }
-
   virtual ConnectionRef connect_to(
     int type, const entity_addrvec_t& dest) = 0;
   ConnectionRef connect_to_mon(const entity_addrvec_t& dest) {
diff --git a/src/msg/simple/SimpleMessenger.h b/src/msg/simple/SimpleMessenger.h
index 6acdeb138be26..b1aad53999805 100644
--- a/src/msg/simple/SimpleMessenger.h
+++ b/src/msg/simple/SimpleMessenger.h
@@ -135,16 +135,13 @@ public:
    * @defgroup Messaging
    * @{
    */
-  int send_message(Message *m, const entity_inst_t& dest) override {
-    return _send_message(m, dest);
-  }
   int send_to(
     Message *m,
     int type,
     const entity_addrvec_t& addr) override {
     // temporary
-    return send_message(m, entity_inst_t(entity_name_t(type, -1),
-					 addr.legacy_addr()));
+    return _send_message(m, entity_inst_t(entity_name_t(type, -1),
+					  addr.legacy_addr()));
   }
 
   int send_message(Message *m, Connection *con) {