osd: handle NOUP flag vs boot race

If we digest maps that show a NOUP flag change *and* we also go active,
there is no need to restart the boot process--we can just go/stay active.

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 59776bf2c14334989758c5fe6d10bb61ef765112..035ac83b1b6a2b5e5cb2d658fe55b47cddf5b46c 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -7421,6 +7421,7 @@ void OSD::_committed_osd_maps(epoch_t first, epoch_t last, MOSDMap *m)
     if (is_booting()) {
       dout(1) << "state: booting -> active" << dendl;
       set_state(STATE_ACTIVE);
+      do_restart = false;
 
       // set incarnation so that osd_reqid_t's we generate for our
       // objecter requests are unique across restarts.