Merge branch 'wip-bigbang'

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

diff --cc src/common/config_opts.h
Simple merge

diff --cc src/msg/async/AsyncConnection.cc
Simple merge

diff --cc src/msg/simple/Pipe.cc
Simple merge

diff --cc src/osd/OSD.cc
index 41ef077dc31bd559c67dd99ae6b129fc2e0581e5,b61529048764e0b1836cc7f646ac740c697302bd..c2267efe7c210d6fe85c2fe18ab6e48c0b7ed228
--- 1/src/osd/OSD.cc
--- 2/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@@ -6566,15 -6569,13 +6593,18 @@@ void OSD::handle_osd_map(MOSDMap *m
  
    if (m->newest_map && m->newest_map > last) {
      dout(10) << " msg say newest map is " << m->newest_map << ", requesting more" << dendl;
-     osdmap_subscribe(osdmap->get_epoch()+1, true);
+     osdmap_subscribe(osdmap->get_epoch()+1, false);
    }
-   else if (is_booting()) {
-     start_boot();  // retry
 +  else if (do_shutdown) {
 +    osd_lock.Unlock();
 +    shutdown();
 +    osd_lock.Lock();
 +  }
+   else if (is_preboot()) {
+     if (m->get_source().is_mon())
+       _preboot(m->oldest_map, m->newest_map);
+     else
+       start_boot();
    }
    else if (do_restart)
      start_boot();

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

diff --cc src/osdc/Objecter.cc
Simple merge