osd: reset heartbeat peer set on osd down

This clears out the timers.

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 0ec1f69a3a32e869a4007c487e5bc18a639fdbaa..e1d19579250b4f7e380d279d44671d480d3a6ada 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -936,6 +936,17 @@ void OSD::update_heartbeat_peers()
   heartbeat_lock.Unlock();
 }
 
+void OSD::reset_heartbeat_peers()
+{
+  dout(10) << "reset_heartbeat_peers" << dendl;
+  heartbeat_lock.Lock();
+  heartbeat_to.clear();
+  heartbeat_from.clear();
+  heartbeat_from_stamp.clear();
+  heartbeat_inst.clear();
+  heartbeat_lock.Unlock();
+}
+
 void OSD::handle_osd_ping(MOSDPing *m)
 {
   dout(20) << "handle_osd_ping from " << m->get_source() << " got stat " << m->peer_stat << dendl;
@@ -1908,6 +1919,8 @@ void OSD::handle_osd_map(MOSDMap *m)
 
     state = STATE_BOOTING;
     boot_epoch = 0;
+
+    reset_heartbeat_peers();
   }
 
 

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index d314a2cbecede70f6ab527a62695b5a9b2644041..56abad447e4f3524d87a8193c4ba4ee8e3d9826f 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -171,6 +171,7 @@ private:
   Messenger *heartbeat_messenger;
   
   void update_heartbeat_peers();
+  void reset_heartbeat_peers();
   void heartbeat();
   void heartbeat_entry();