Merge remote branch 'origin/stable'

Conflicts:
	src/osd/OSD.cc

diff --cc src/mds/MDS.cc
Simple merge

diff --cc src/mds/MDSMap.h
Simple merge

diff --cc src/osd/OSD.cc
index e3c659e0c75962f251fed70e70cd8992967ba40d,bf2da5a2193403497b2c23c2c17fabb8bf884e21..870bac7023444d4f6f9bcd8adc45399866bae7b7
--- 1/src/osd/OSD.cc
--- 2/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@@ -2907,9 -2768,23 +2929,24 @@@ void OSD::handle_osd_map(MOSDMap *m
        dout(0) << "map says i do not exist.  shutting down." << dendl;
        do_shutdown = true;   // don't call shutdown() while we have everything paused
      } else if (!osdmap->is_up(whoami) ||
-              osdmap->get_addr(whoami) != client_messenger->get_myaddr()) {
-       clog.warn() << "map e" << osdmap->get_epoch()
-       << " wrongly marked me down\n";
+              !osdmap->get_addr(whoami).probably_equals(client_messenger->get_myaddr()) ||
+              !osdmap->get_cluster_addr(whoami).probably_equals(cluster_messenger->get_myaddr()) ||
+              !osdmap->get_hb_addr(whoami).probably_equals(heartbeat_messenger->get_myaddr())) {
 -      stringstream ss;
 -      ss << "map e" << osdmap->get_epoch();
+       if (!osdmap->is_up(whoami))
 -      ss << " wrongly marked me down or wrong addr";
++      clog.warn() << "map e" << osdmap->get_epoch()
++                  << " wrongly marked me down or wrong addr";
+       else if (!osdmap->get_addr(whoami).probably_equals(client_messenger->get_myaddr()))
 -      ss << " had wrong client addr (" << osdmap->get_addr(whoami)
 -         << " != my " << client_messenger->get_myaddr();
++      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()))
 -        ss << " had wrong client addr (" << osdmap->get_cluster_addr(whoami)
 -           << " != my " << 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()))
 -        ss << " had wrong client addr (" << osdmap->get_hb_addr(whoami)
 -           << " != my " << heartbeat_messenger->get_myaddr();
 -      logclient.log(LOG_WARN, ss);
++      clog.warn() << "map e" << osdmap->get_epoch()
++                  << " had wrong client addr (" << osdmap->get_hb_addr(whoami)
++                  << " != my " << heartbeat_messenger->get_myaddr();
        
        state = STATE_BOOTING;
        up_epoch = 0;

diff --cc src/osd/OSD.h
Simple merge

diff --cc src/osd/ReplicatedPG.cc
Simple merge