osd: ping mon less frequently when peerless

Every second is too much.  Make it tunable.

diff --git a/src/config.cc b/src/config.cc
index 097ebccbc2a0399308a1d25e12b051278dda414c..d5d2545d4e09d6a7b3b6202815b896fa8cf9ab7c 100644 (file)
--- a/src/config.cc
+++ b/src/config.cc
@@ -418,6 +418,7 @@ md_config_t g_conf = {
   osd_age: .8,
   osd_age_time: 0,
   osd_heartbeat_interval: 1,
+  osd_mon_heartbeat_interval: 30,  // if no peers, ping monitor
   osd_heartbeat_grace: 60,
   osd_mon_report_interval:  5,  // pg stats, failures, up_thru, boot.
   osd_replay_window: 45,

diff --git a/src/config.h b/src/config.h
index 6b75d68068f4aa4981d235d5c1cf37af5cb43dce..2de072f144bf0febc5665e26c0c241fc1276cc81 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -284,6 +284,7 @@ struct md_config_t {
   float   osd_age;
   int   osd_age_time;
   int   osd_heartbeat_interval;  
+  int   osd_mon_heartbeat_interval;  
   int   osd_heartbeat_grace;
   int   osd_mon_report_interval;
   int   osd_replay_window;

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index e6b37c992ec8d81be77103a930f6f9c00ffd085f..eb11c4a98ba1a97b7b2234fcbec7390453b85a94 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1125,10 +1125,13 @@ void OSD::heartbeat()
   
   // hmm.. am i all alone?
   if (heartbeat_from.empty() || heartbeat_to.empty()) {
-    dout(10) << "i have no heartbeat peers; checking mon for new map" << dendl;
-    int mon = monmap->pick_mon();
-    messenger->send_message(new MOSDGetMap(monmap->fsid, osdmap->get_epoch()+1),
-                            monmap->get_inst(mon));
+    if (now - last_mon_heartbeat > g_conf.osd_mon_heartbeat_interval) {
+      last_mon_heartbeat = now;
+      dout(10) << "i have no heartbeat peers; checking mon for new map" << dendl;
+      int mon = monmap->pick_mon();
+      messenger->send_message(new MOSDGetMap(monmap->fsid, osdmap->get_epoch()+1),
+                             monmap->get_inst(mon));
+    }
   }
 
   if (map_locked)