osd: mark down old _from connections too; and fix old _from debug output

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 52d8e7c48842149f302f1798da06b8bff79b95e5..74c9f8867335f7dcfab08b654c99b94ae8c88954 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1247,10 +1247,17 @@ void OSD::update_heartbeat_peers()
   for (map<int,epoch_t>::iterator p = old_from.begin();
        p != old_from.end();
        p++) {
-    if (heartbeat_to.count(p->first) == 0 ||
-       heartbeat_inst[p->first] != old_inst[p->first])
-      dout(10) << "update_heartbeat_peers: dropped old _from osd" << p->first 
-              << " " << old_inst[p->first] << dendl;
+    if (heartbeat_from.count(p->first) == 0 ||
+       heartbeat_inst[p->first] != old_inst[p->first]) {
+      if (heartbeat_to.count(p->first) == 0) {
+       dout(10) << "update_heartbeat_peers: marking down old _from peer " << old_inst[p->first] 
+                << " as of " << p->second << dendl;
+       heartbeat_messenger->mark_down(old_inst[p->first].addr);
+      } else {
+       dout(10) << "update_heartbeat_peers: old _from peer " << old_inst[p->first]
+                << " is still a _to peer, not marking down" << dendl;
+      }
+    }
   }
 
   heartbeat_epoch = osdmap->get_epoch();