]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: mark down old _to targets
authorSage Weil <sage.weil@dreamhost.com>
Fri, 20 May 2011 18:25:27 +0000 (11:25 -0700)
committerSage Weil <sage.weil@dreamhost.com>
Fri, 20 May 2011 18:25:27 +0000 (11:25 -0700)
If a peer remains a _to target but their address changes, we still want
to mark down the old connection.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
src/osd/OSD.cc

index 8af38739d062618f31b433d816c89a779b461010..58cb031b766be351affe4a5df410929dec8eab2e 100644 (file)
@@ -1470,7 +1470,7 @@ void OSD::update_heartbeat_peers()
        p != old_to.end();
        p++) {
     assert(old_inst.count(p->first));
-    if (heartbeat_to.count(p->first))
+    if (heartbeat_to.count(p->first) && heartbeat_inst[p->first] == old_inst[p->first])
       continue;
     assert(p->second <= osdmap->get_epoch());