From: Sage Weil <sage@newdream.net>
Date: Thu, 8 Oct 2009 18:43:43 +0000 (-0700)
Subject: osd: don't manually set rank addr
X-Git-Tag: v0.17~110
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ddb359e83f334fee0cde670e88563077ad250816;p=ceph.git

osd: don't manually set rank addr

This didn't accomplish anything useful.
---

diff --git a/src/cosd.cc b/src/cosd.cc
index d1337fbf265..8b0ba5d03d3 100644
--- a/src/cosd.cc
+++ b/src/cosd.cc
@@ -126,8 +126,6 @@ int main(int argc, const char **argv)
   SimpleMessenger rank;
   rank.bind();
 
-  rank.set_addr(mc.get_my_addr());
-
   cout << "starting osd" << whoami
        << " at " << rank.get_rank_addr() 
        << " osd_data " << g_conf.osd_data
diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index 91a770b1d98..f04eb72ef4e 100644
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -138,6 +138,7 @@ int SimpleMessenger::Accepter::bind(int64_t force_nonce)
     rank->need_addr = false;
   else 
     rank->need_addr = true;
+
   if (rank->rank_addr.get_port() == 0) {
     rank->rank_addr.in4_addr() = listen_addr;
     if (force_nonce >= 0)
diff --git a/src/msg/SimpleMessenger.h b/src/msg/SimpleMessenger.h
index 8543d8fbd4d..f4d5d671662 100644
--- a/src/msg/SimpleMessenger.h
+++ b/src/msg/SimpleMessenger.h
@@ -466,11 +466,6 @@ public:
     return ++global_seq;
   }
 
-  void set_addr(entity_addr_t a) {
-    rank_addr = a;
-    need_addr = false;
-  }
-
   Endpoint *register_entity(entity_name_t addr);
   void rename_entity(Endpoint *ms, entity_name_t newaddr);
   void unregister_entity(Endpoint *ms);