From: Sage Weil <sage.weil@dreamhost.com>
Date: Mon, 8 Aug 2011 04:27:03 +0000 (-0700)
Subject: osd: missing ! in ifs on bad map after osd boot
X-Git-Tag: v0.33~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=68cbbf42c4228726205fe57b82ac9de30f140f31;p=ceph.git

osd: missing ! in ifs on bad map after osd boot

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index de9fec2a97e5..6371c2b9830a 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -3108,11 +3108,11 @@ void OSD::handle_osd_map(MOSDMap *m)
 	clog.warn() << "map e" << osdmap->get_epoch()
 		    << " had wrong client addr (" << osdmap->get_addr(whoami)
 		    << " != my " << client_messenger->get_myaddr();
-      else if (osdmap->get_cluster_addr(whoami).probably_equals(cluster_messenger->get_myaddr()))
+      else if (!osdmap->get_cluster_addr(whoami).probably_equals(cluster_messenger->get_myaddr()))
 	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(heartbeat_messenger->get_myaddr()))
 	clog.warn() << "map e" << osdmap->get_epoch()
 		    << " had wrong client addr (" << osdmap->get_hb_addr(whoami)
 		    << " != my " << heartbeat_messenger->get_myaddr();