osd: kill osd_heartbeat_addr option

This serves no (good) purpose: we should always use the public addr/
network.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index e06be5874721665fae83d209850d776f57fcf0b9..4f10c9d8359cbd2490a1ceaab29f8d680dafa0c4 100644 (file)
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -25,3 +25,7 @@
   filesystem ``cephfs_a``, use command:
 
     - ``ceph auth caps client.foo mon 'allow r' osd 'allow rw tag cephfs data=cephfs_a' mds 'allow rw, allow rws path=/bar'``
+
+* The ``osd_heartbeat_addr`` option has been removed as it served no
+  (good) purpose: the OSD should always check heartbeats on both the
+  public and cluster networks.

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index 95d03ecd8d48d32e530ccefc9bc1231a19ea8200..1a8398b154dbe2e4b6e293b79ed5475e48f26330 100644 (file)
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -589,12 +589,9 @@ flushjournal_out:
   }
 
   // hb back should bind to same ip as cluster_addr (if specified)
-  entity_addr_t haddr = g_conf->get_val<entity_addr_t>("osd_heartbeat_addr");
-  if (haddr.is_blank_ip()) {
-    haddr = caddr;
-    if (haddr.is_ip())
-      haddr.set_port(0);
-  }
+  entity_addr_t haddr = caddr;
+  if (haddr.is_ip())
+    haddr.set_port(0);
 
   if (ms_hb_back_server->bind(haddr) < 0)
     forker.exit(1);

diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h
index 00fcacb44e609b3cb0aae30e4006b02bc620c9e6..a27960dbdfb6c1158365caad805e736345fdb464 100644 (file)
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@ -681,7 +681,6 @@ OPTION(osd_remove_thread_timeout, OPT_INT)
 OPTION(osd_remove_thread_suicide_timeout, OPT_INT)
 OPTION(osd_command_thread_timeout, OPT_INT)
 OPTION(osd_command_thread_suicide_timeout, OPT_INT)
-OPTION(osd_heartbeat_addr, OPT_ADDR)
 OPTION(osd_heartbeat_interval, OPT_INT)       // (seconds) how often we ping peers
 
 // (seconds) how long before we decide a peer has failed

diff --git a/src/common/options.cc b/src/common/options.cc
index 827aa03a7107ab11548e2da67446769886a1e4aa..49ccafa02419b8f0ed548b8ae2292def2678c8c3 100644 (file)
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -2896,10 +2896,6 @@ std::vector<Option> get_global_options() {
     .set_default(15_min)
     .set_description(""),
 
-    Option("osd_heartbeat_addr", Option::TYPE_ADDR, Option::LEVEL_ADVANCED)
-    .set_default(entity_addr_t())
-    .set_description(""),
-
     Option("osd_heartbeat_interval", Option::TYPE_INT, Option::LEVEL_ADVANCED)
     .set_default(6)
     .set_min_max(1, 86400)