config: rename g_my_addr to g_public_addr, add g_cluster_addr

diff --git a/src/cmon.cc b/src/cmon.cc
index 91737b3004d95f7a7297c57aba3d8146a336a29b..65c8e5d8ec6a02a1ff71d162d5a50910bf90900c 100644 (file)
--- a/src/cmon.cc
+++ b/src/cmon.cc
@@ -211,7 +211,7 @@ int main(int argc, const char **argv)
        << " mon_data " << g_conf.mon_data
        << " fsid " << monmap.get_fsid()
        << std::endl;
-  g_my_addr = monmap.get_addr(name);
+  g_public_addr = monmap.get_addr(name);
   err = messenger->bind();
   if (err < 0)
     return 1;

diff --git a/src/config.cc b/src/config.cc
index 305789a21fbc23b2ac78595c49835bf1b46a9d98..9f38879ab3aebe1ed396af6b2797832d7bda6b9b 100644 (file)
--- a/src/config.cc
+++ b/src/config.cc
@@ -91,7 +91,8 @@ struct ceph_file_layout g_default_file_layout = {
 // fake osd failures: osd -> time
 std::map<entity_name_t,float> g_fake_kill_after;
 
-entity_addr_t g_my_addr;
+entity_addr_t g_public_addr;
+entity_addr_t g_cluster_addr;
 
 md_config_t g_conf;
 bool g_daemon = false;
@@ -978,7 +979,11 @@ void parse_startup_config_options(std::vector<const char*>& args, const char *mo
     } else if (CONF_ARG_EQ("show_conf", 'S')) {
       show_config = true;
     } else if (isdaemon && CONF_ARG_EQ("bind", 0)) {
-      g_my_addr.parse(args[++i]);
+      g_public_addr.parse(args[++i]);
+    } else if (CONF_ARG_EQ("public_addr", 0)) {
+      g_public_addr.parse(args[++i]);
+    } else if (CONF_ARG_EQ("cluster_addr", 0)) {
+      g_cluster_addr.parse(args[++i]);
     } else if (isdaemon && CONF_ARG_EQ("nodaemon", 'D')) {
       g_conf.daemonize = false;
       g_conf.log_to_stdout = true;

diff --git a/src/config.h b/src/config.h
index ec263266befcef035080a922e46f5287316a336b..0aefa46d681223dffe30929bd819baa62cff644b 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -31,7 +31,8 @@ extern struct ceph_file_layout g_default_file_layout;
 
 #include "msg/msg_types.h"
 
-extern entity_addr_t g_my_addr;
+extern entity_addr_t g_public_addr;
+extern entity_addr_t g_cluster_addr;
 
 extern bool g_daemon;
 extern const char *g_default_id;

diff --git a/src/testmsgr.cc b/src/testmsgr.cc
index 7af5622a76ef87c0238f3358ee4b1a4abf587e35..68e4a7020b7dc0891ee3257228138a943bdef08e 100644 (file)
--- a/src/testmsgr.cc
+++ b/src/testmsgr.cc
@@ -84,7 +84,7 @@ int main(int argc, const char **argv, const char *envp[]) {
   // start up network
   int whoami = mc.monmap.get_rank(args[0]);
   assert(whoami >= 0);
-  g_my_addr = mc.monmap.get_addr(whoami);
+  g_public_addr = mc.monmap.get_addr(whoami);
 
   SimpleMessenger *rank = new SimpleMessenger();
   int err = rank->bind();