msgr: Remove the SimpleMessenger::bind() nonce parameter.

Instead, use the just-established nonce value.

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>

diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc
index bc5095559b63c59dd0f8d49cf237ca66658340e7..76aefd7609c5231d04d2f44dfbe2069ec73bfe3a 100644 (file)
--- a/src/ceph_mds.cc
+++ b/src/ceph_mds.cc
@@ -71,8 +71,8 @@ static int do_cmds_special_action(const std::string &action,
   common_init_finish(g_ceph_context);
   SimpleMessenger *messenger = new SimpleMessenger(g_ceph_context,
                                                    entity_name_t::CLIENT());
-  int r = messenger->bind(g_conf->public_addr, getpid());
   messenger->set_nonce(getpid());
+  int r = messenger->bind(g_conf->public_addr);
   if (r < 0)
     return r;
   MonClient mc(g_ceph_context);
@@ -234,8 +234,9 @@ int main(int argc, const char **argv)
   SimpleMessenger *messenger = new SimpleMessenger(g_ceph_context,
                                                    entity_name_t::MDS(-1));
   messenger->set_cluster_protocol(CEPH_MDS_PROTOCOL);
+  messenger->set_nonce(getpid());
 
-  int r = messenger->bind(g_conf->public_addr, getpid());
+  int r = messenger->bind(g_conf->public_addr);
   if (r < 0)
     exit(1);
 

diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index c604015034a69cc4f9380e73a36311d6b5f90d91..02d9ec45fc4da412f39efb4d4cf971caee6b94d5 100644 (file)
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -379,7 +379,7 @@ int main(int argc, const char **argv)
        << " fsid " << monmap.get_fsid()
        << std::endl;
 
-  err = messenger->bind(ipaddr, 0);
+  err = messenger->bind(ipaddr);
   if (err < 0)
     return 1;
 

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index 9e8b96762187d255c7a2218682d8e382d75d4e44..98a998d906cbdf691f3237c330cb4e8e6b9c484b 100644 (file)
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -301,18 +301,21 @@ int main(int argc, const char **argv)
   }
 
   SimpleMessenger *client_messenger = new SimpleMessenger(g_ceph_context, entity_name_t::OSD(whoami));
+  client_messenger->set_nonce(getpid());
   SimpleMessenger *cluster_messenger = new SimpleMessenger(g_ceph_context, entity_name_t::OSD(whoami));
+  cluster_messenger->set_nonce(getpid());
   SimpleMessenger *messenger_hbin = new SimpleMessenger(g_ceph_context,entity_name_t::OSD(whoami));
+  messenger_hbin->set_nonce(getpid());
   SimpleMessenger *messenger_hbout = new SimpleMessenger(g_ceph_context, entity_name_t::OSD(whoami));
+  messenger_hbout->set_nonce(getpid());
   cluster_messenger->set_cluster_protocol(CEPH_OSD_PROTOCOL);
   messenger_hbin->set_cluster_protocol(CEPH_OSD_PROTOCOL);
-  messenger_hbin->set_nonce(getpid());
   messenger_hbout->set_cluster_protocol(CEPH_OSD_PROTOCOL);
 
-  r = client_messenger->bind(g_conf->public_addr, getpid());
+  r = client_messenger->bind(g_conf->public_addr);
   if (r < 0)
     exit(1);
-  r = cluster_messenger->bind(g_conf->cluster_addr, getpid());
+  r = cluster_messenger->bind(g_conf->cluster_addr);
   if (r < 0)
     exit(1);
 
@@ -320,7 +323,7 @@ int main(int argc, const char **argv)
   entity_addr_t hb_addr = g_conf->cluster_addr;
   if (!hb_addr.is_blank_ip())
     hb_addr.set_port(0);
-  r = messenger_hbout->bind(hb_addr, getpid());
+  r = messenger_hbout->bind(hb_addr);
   if (r < 0)
     exit(1);
 

diff --git a/src/ceph_syn.cc b/src/ceph_syn.cc
index 9d924adeaa075a4e26b6849dd9e42eb50c2d8a0f..db90373fc574b1138a54d691b445747eaa00460d 100644 (file)
--- a/src/ceph_syn.cc
+++ b/src/ceph_syn.cc
@@ -69,7 +69,8 @@ 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] = new SimpleMessenger(g_ceph_context, entity_name_t(entity_name_t::TYPE_CLIENT,-1));
-    messengers[i]->bind(g_conf->public_addr, i * 1000000 + getpid());
+    messengers[i]->set_nonce(i * 1000000 + getpid());
+    messengers[i]->bind(g_conf->public_addr);
     mclients[i] = new MonClient(g_ceph_context);
     mclients[i]->build_initial_monmap();
     Client *client = new Client(messengers[i], mclients[i]);

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index 3d0ad69bf108fe06efe544cfdddd992c54af7a44..ae93e76a63c0d620478d2536d1bec5add73a6b46 100644 (file)
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -2380,7 +2380,7 @@ void SimpleMessenger::queue_reap(Pipe *pipe)
 
 
 
-int SimpleMessenger::bind(entity_addr_t bind_addr, int64_t nonce)
+int SimpleMessenger::bind(entity_addr_t bind_addr)
 {
   lock.Lock();
   if (started) {

diff --git a/src/msg/SimpleMessenger.h b/src/msg/SimpleMessenger.h
index efb1d662993c31062d4eab24efacd636ba0e33e9..30c9248ac13b9e1309fcfe006b4a5a31258e70e1 100644 (file)
--- a/src/msg/SimpleMessenger.h
+++ b/src/msg/SimpleMessenger.h
@@ -529,7 +529,7 @@ public:
     delete dispatch_queue.local_pipe;
   }
 
-  int bind(entity_addr_t bind_addr, int64_t nonce);
+  int bind(entity_addr_t bind_addr);
   virtual int start();
   virtual void wait();
 

diff --git a/src/testmsgr.cc b/src/testmsgr.cc
index ac7b6469a9d8879e2b5c5db00358e920b009629b..8ff28f3c41f5b61db1e30476b1b586ab6c694712 100644 (file)
--- a/src/testmsgr.cc
+++ b/src/testmsgr.cc
@@ -98,7 +98,8 @@ int main(int argc, const char **argv, const char *envp[]) {
   g_ceph_context->_conf->apply_changes(NULL);
   SimpleMessenger *rank = new SimpleMessenger(g_ceph_context,
                                               entity_name_t::MON(whoami));
-  int err = rank->bind(g_ceph_context->_conf->public_addr, getpid());
+  rank->set_nonce(getpid());
+  int err = rank->bind(g_ceph_context->_conf->public_addr);
   if (err < 0)
     return 1;