From: Sage Weil <sage@redhat.com>
Date: Wed, 7 Mar 2018 21:09:16 +0000 (-0600)
Subject: osd: handle NOUP flag vs boot race
X-Git-Tag: v13.1.0~390^2~34
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5155baf323a77946b7f37736252fc98ae6bda330;p=ceph.git

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 59776bf2c14..035ac83b1b6 100644
--- 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.