From: Sage Weil <sage.weil@dreamhost.com>
Date: Fri, 20 May 2011 18:25:27 +0000 (-0700)
Subject: osd: mark down old _to targets
X-Git-Tag: v0.28.1~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0f1be62914643158a21c471111e65ff180328c86;p=ceph.git

osd: mark down old _to targets

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>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 8af38739d0626..58cb031b766be 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -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());