From: Sage Weil <sage@newdream.net>
Date: Mon, 8 Aug 2011 19:12:24 +0000 (-0700)
Subject: Merge branch 'wip-heartbeats'
X-Git-Tag: v0.33~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a9da6db63161767074285648ebb12461275bd907;p=ceph.git

Merge branch 'wip-heartbeats'

Conflicts:
	src/osd/OSD.cc
---

a9da6db63161767074285648ebb12461275bd907
diff --cc src/osd/OSD.cc
index ca937d79421f,2c867dff2d6b..63942c1a2638
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@@ -3114,10 -3082,10 +3084,10 @@@ void OSD::handle_osd_map(MOSDMap *m
  	clog.warn() << "map e" << osdmap->get_epoch()
  		    << " had wrong client addr (" << osdmap->get_cluster_addr(whoami)
  		    << " != my " << cluster_messenger->get_myaddr();
-       else if (!osdmap->get_hb_addr(whoami).probably_equals(heartbeat_messenger->get_myaddr()))
 -      else if (osdmap->get_hb_addr(whoami).probably_equals(hbout_messenger->get_myaddr()))
++      else if (!osdmap->get_hb_addr(whoami).probably_equals(hbout_messenger->get_myaddr()))
  	clog.warn() << "map e" << osdmap->get_epoch()
  		    << " had wrong client addr (" << osdmap->get_hb_addr(whoami)
- 		    << " != my " << heartbeat_messenger->get_myaddr();
+ 		    << " != my " << hbout_messenger->get_myaddr();
        
        state = STATE_BOOTING;
        up_epoch = 0;