fixed cmon

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1710 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/trunk/ceph/TODO b/trunk/ceph/TODO
index b20a555dff8e1cf678d6a8851e98822cf17d7b85..56d8b9828cf30d2774394cd08d2412db0e825130 100644 (file)
--- a/trunk/ceph/TODO
+++ b/trunk/ceph/TODO
@@ -53,9 +53,7 @@ sage mds
 
 - fix server unlink .. needs to use slave_requests to clean up any failures during the resolve stage
 
-/- .ceph_hosts file, so we can use the infiniband addresses
-
-- look at mds osds
+/- look at mds osds
 
 
 

diff --git a/trunk/ceph/cmon.cc b/trunk/ceph/cmon.cc
index 26e3b3b3fcadbf2d1d58b175c2e4fc551e4c5d61..f9ada45f7ef99bc43a0db4327e10f8b4a8396504 100644 (file)
--- a/trunk/ceph/cmon.cc
+++ b/trunk/ceph/cmon.cc
@@ -86,7 +86,7 @@ int main(int argc, char **argv)
 
     // start messenger
     rank.start_rank();
-    cout << "bound to " << rank.get_listen_addr() << std::endl;
+    cout << "bound to " << rank.get_my_addr() << std::endl;
 
     // add single mon0
     entity_inst_t inst;

diff --git a/trunk/ceph/msg/SimpleMessenger.h b/trunk/ceph/msg/SimpleMessenger.h
index 976c0b8a2b61c565e1e54ecdf285ba3acebd9d92..6183c106499d4fd352003f8327d8f1d0a7178052 100644 (file)
--- a/trunk/ceph/msg/SimpleMessenger.h
+++ b/trunk/ceph/msg/SimpleMessenger.h
@@ -264,7 +264,7 @@ private:
   void mark_down(entity_addr_t addr);
   //void mark_up(entity_name_t addr, entity_addr_t& i);
 
-  //tcpaddr_t get_listen_addr() { return listen_addr; }
+  entity_addr_t get_my_addr() { return my_addr; }
 
   void reaper();