msgr: name messengers

Give each Messenger a logical name describing its role.  For instance, the
OSD will have client, cluster, and heartbeat messengers.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/ceph_fuse.cc b/src/ceph_fuse.cc
index d08cf85950421ebdb511b5df78c4e9a52dbc8841..d76963a78801009d9da629279e26e3a989f7c3e0 100644 (file)
--- a/src/ceph_fuse.cc
+++ b/src/ceph_fuse.cc
@@ -91,7 +91,7 @@ int main(int argc, const char **argv, const char *envp[]) {
 
   // start up network
   Messenger *messenger = Messenger::create(g_ceph_context,
-                                          entity_name_t::CLIENT(),
+                                          entity_name_t::CLIENT(), "client",
                                           getpid());
   Client *client = new Client(messenger, &mc);
   if (filer_flags) {

diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc
index 35574d8f5614d56f5bab2afa38540c3c96c82b7b..179aa4529d0fc38dfdc98db7ef475842a35b2809 100644 (file)
--- a/src/ceph_mds.cc
+++ b/src/ceph_mds.cc
@@ -72,7 +72,7 @@ static int do_cmds_special_action(const std::string &action,
 {
   common_init_finish(g_ceph_context);
   Messenger *messenger = Messenger::create(g_ceph_context,
-                                          entity_name_t::CLIENT(),
+                                          entity_name_t::CLIENT(), "mds",
                                           getpid());
   int r = messenger->bind(g_conf->public_addr);
   if (r < 0)
@@ -234,7 +234,7 @@ int main(int argc, const char **argv)
   global_print_banner();
 
   Messenger *messenger = Messenger::create(g_ceph_context,
-                                          entity_name_t::MDS(-1),
+                                          entity_name_t::MDS(-1), "mds",
                                           getpid());
   messenger->set_cluster_protocol(CEPH_MDS_PROTOCOL);
 

diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index 01604ef9e290c48b30bea0b0f41779c37932a920..6474685d9d2b8ef831832e2caa65215708ff0d70 100644 (file)
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -366,6 +366,7 @@ int main(int argc, const char **argv)
   int rank = monmap.get_rank(g_conf->name.get_id());
   Messenger *messenger = Messenger::create(g_ceph_context,
                                           entity_name_t::MON(rank),
+                                          "mon",
                                           0);
   messenger->set_cluster_protocol(CEPH_MON_PROTOCOL);
   messenger->set_default_send_priority(CEPH_MSG_PRIO_HIGH);

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index f0446adf6b5b36e7c28f266cb0fbae3ad1c12af0..e2d79606b848fbfae7fff1d5b59d0ff4e76c4b01 100644 (file)
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -303,17 +303,17 @@ int main(int argc, const char **argv)
   }
 
   Messenger *client_messenger = Messenger::create(g_ceph_context,
-                                                 entity_name_t::OSD(whoami),
+                                                 entity_name_t::OSD(whoami), "client",
                                                  getpid());
   Messenger *cluster_messenger = Messenger::create(g_ceph_context,
-                                                  entity_name_t::OSD(whoami),
+                                                  entity_name_t::OSD(whoami), "cluster",
                                                   getpid());
   Messenger *messenger_hbclient = Messenger::create(g_ceph_context,
-                                               entity_name_t::OSD(whoami),
-                                               getpid());
+                                                   entity_name_t::OSD(whoami), "hbclient",
+                                                   getpid());
   Messenger *messenger_hbserver = Messenger::create(g_ceph_context,
-                                                entity_name_t::OSD(whoami),
-                                                getpid());
+                                                   entity_name_t::OSD(whoami), "hbserver",
+                                                   getpid());
   cluster_messenger->set_cluster_protocol(CEPH_OSD_PROTOCOL);
   messenger_hbclient->set_cluster_protocol(CEPH_OSD_PROTOCOL);
   messenger_hbserver->set_cluster_protocol(CEPH_OSD_PROTOCOL);

diff --git a/src/ceph_syn.cc b/src/ceph_syn.cc
index 8eb238ad2b20fb1c911356ee43f7304f39aa360f..7cb0ab3ce91a421a80e3a790fedda3daf6914054 100644 (file)
--- a/src/ceph_syn.cc
+++ b/src/ceph_syn.cc
@@ -69,7 +69,7 @@ int main(int argc, const char **argv, char *envp[])
   cout << "ceph-syn: starting " << g_conf->num_client << " syn client(s)" << std::endl;
   for (int i=0; i<g_conf->num_client; i++) {
     messengers[i] = Messenger::create(g_ceph_context,
-                                     entity_name_t(entity_name_t::TYPE_CLIENT,-1),
+                                     entity_name_t(entity_name_t::TYPE_CLIENT,-1), "synclient",
                                      i * 1000000 + getpid());
     messengers[i]->bind(g_conf->public_addr);
     mclients[i] = new MonClient(g_ceph_context);

diff --git a/src/libcephfs.cc b/src/libcephfs.cc
index 4348fe2284f2773e8c54b51fb7dd99827cd4bd2c..e4fbf6a29201a8d76513ae4719c4d055a2dea0e4 100644 (file)
--- a/src/libcephfs.cc
+++ b/src/libcephfs.cc
@@ -77,7 +77,7 @@ public:
       goto fail;
 
     //network connection
-    messenger = Messenger::create(cct, entity_name_t::CLIENT(), msgr_nonce);
+    messenger = Messenger::create(cct, entity_name_t::CLIENT(), "client", msgr_nonce);
 
     //at last the client
     ret = -1002;

diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc
index 8016199dc01c282405da7468c795d39daeff1bb2..17db7676330d8f075ddbf71fc574138921fc692f 100644 (file)
--- a/src/librados/RadosClient.cc
+++ b/src/librados/RadosClient.cc
@@ -121,7 +121,7 @@ int librados::RadosClient::connect()
 
   err = -ENOMEM;
   nonce = getpid() + (1000000 * (uint64_t)rados_instance.inc());
-  messenger = new SimpleMessenger(cct, entity_name_t::CLIENT(-1), nonce);
+  messenger = new SimpleMessenger(cct, entity_name_t::CLIENT(-1), "radosclient", nonce);
   if (!messenger)
     goto out;
 

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index f73b1e7e01f1e28d6160899154b9bf52a23a63a5..e1ef375beb98bd60f72a38567117bfc5fac379ed 100644 (file)
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -223,6 +223,7 @@ int MonClient::get_monmap_privately()
   if (!messenger) {
     messenger = smessenger = new SimpleMessenger(cct,
                                                  entity_name_t::CLIENT(-1),
+                                                "temp_mon_client",
                                                  getpid());
     messenger->add_dispatcher_head(this);
     smessenger->start();

diff --git a/src/msg/Messenger.cc b/src/msg/Messenger.cc
index 6cf8e41ffbaf3a725b6290f3ca4cc9b272b8bf3c..b80782de518dbbb33991170cf5b4252ced5d4ef2 100644 (file)
--- a/src/msg/Messenger.cc
+++ b/src/msg/Messenger.cc
@@ -6,7 +6,8 @@
 
 Messenger *Messenger::create(CephContext *cct,
                             entity_name_t name,
+                            string lname,
                             uint64_t nonce)
 {
-  return new SimpleMessenger(cct, name, nonce);
+  return new SimpleMessenger(cct, name, lname, nonce);
 }

diff --git a/src/msg/Messenger.h b/src/msg/Messenger.h
index 730fa1a68ecae5cd1747f94a12ead606bc40fe49..8efb3dddd380d8d4bebd56a56498ac59618994b4 100644 (file)
--- a/src/msg/Messenger.h
+++ b/src/msg/Messenger.h
@@ -75,14 +75,16 @@ private:
 protected:
   /// the "name" of the local daemon. eg client.99
   entity_inst_t my_inst;
+  /// the name for the messenger in the context of this process (e.g., "client", "backend", "heartbeat")
+  string name;
   int default_send_priority;
   /// set to true once the Messenger has started, and set to false on shutdown
   bool started;
 
  public:
   CephContext *cct;
-  Messenger(CephContext *cct_, entity_name_t w)
-    : my_inst(),
+  Messenger(CephContext *cct_, entity_name_t w, string name)
+    : my_inst(), name(name),
       default_send_priority(CEPH_MSG_PRIO_DEFAULT), started(false),
       cct(cct_)
   {
@@ -342,11 +344,13 @@ protected:
    * available or specified via the configuration in cct.
    *
    * @param cct context
-   * @param name entity name to register
+   * @param ename entity name to register
+   * @param lname logical name of the messenger in this process (e.g., "client")
    * @param nonce nonce value to uniquely identify this instance on the current host
    */
   static Messenger *create(CephContext *cct,
                           entity_name_t name,
+                          string lname,
                           uint64_t nonce);
 };
 

diff --git a/src/msg/SimpleMessenger.h b/src/msg/SimpleMessenger.h
index 6294aa7d8a1dd22df4c9976a7c8b0b61848ba3e7..7fef619dc82446c618e4e8e401b41128661a1d5e 100644 (file)
--- a/src/msg/SimpleMessenger.h
+++ b/src/msg/SimpleMessenger.h
@@ -573,8 +573,8 @@ private:
   int get_proto_version(int peer_type, bool connect);
 
 public:
-  SimpleMessenger(CephContext *cct, entity_name_t name, uint64_t _nonce) :
-    Messenger(cct, name),
+  SimpleMessenger(CephContext *cct, entity_name_t name, string mname, uint64_t _nonce) :
+    Messenger(cct, name, mname),
     accepter(this),
     lock("SimpleMessenger::lock"), did_bind(false),
     dispatch_throttler(cct, "dispatch_throttler", cct->_conf->ms_dispatch_throttle_bytes),

diff --git a/src/testmsgr.cc b/src/testmsgr.cc
index a2b13170ff45369f76afdb0733bd009db042aeb5..e6d13250effab272d97b4da87e40788896b92c49 100644 (file)
--- a/src/testmsgr.cc
+++ b/src/testmsgr.cc
@@ -98,7 +98,7 @@ int main(int argc, const char **argv, const char *envp[]) {
   g_ceph_context->_conf->set_val("public_addr", sss.c_str());
   g_ceph_context->_conf->apply_changes(NULL);
   Messenger *rank = Messenger::create(g_ceph_context,
-                                     entity_name_t::MON(whoami),
+                                     entity_name_t::MON(whoami), "tester",
                                      getpid());
   int err = rank->bind(g_ceph_context->_conf->public_addr);
   if (err < 0)

diff --git a/src/tools/common.cc b/src/tools/common.cc
index 2bdc6999ebbb077efd2c38b201ed233011e8d7b2..e2055d35ac84d7c030e7566daa93f55c790f00e2 100644 (file)
--- a/src/tools/common.cc
+++ b/src/tools/common.cc
@@ -652,7 +652,7 @@ CephToolCtx* ceph_tool_common_init(ceph_tool_mode_t mode, bool concise)
   tok = tok_init(NULL);
 
   // start up network
-  messenger = new SimpleMessenger(g_ceph_context, entity_name_t::CLIENT(),
+  messenger = new SimpleMessenger(g_ceph_context, entity_name_t::CLIENT(), "client",
                                   getpid());
   messenger->start();
   ctx->dispatcher = new Admin(ctx.get());