From: Sage Weil <sage@redhat.com>
Date: Mon, 19 Oct 2015 02:22:53 +0000 (-0400)
Subject: osd: init objecter after we authenticate
X-Git-Tag: v9.2.0~6^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F6313%2Fhead;p=ceph.git

osd: init objecter after we authenticate

Move objecter init until after we authenticate.  We ignore
osdmap messages while initializing anyway so it's pointless to
ask for them.

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 38bebd81feb4..80d8da305650 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1929,10 +1929,6 @@ int OSD::init()
     tick_timer_without_osd_lock.add_event_after(cct->_conf->osd_heartbeat_interval, new C_Tick_WithoutOSDLock(this));
   }
 
-  service.init();
-  service.publish_map(osdmap);
-  service.publish_superblock(superblock);
-
   osd_lock.Unlock();
 
   r = monc->authenticate();
@@ -1951,6 +1947,10 @@ int OSD::init()
   if (is_stopping())
     return 0;
 
+  service.init();
+  service.publish_map(osdmap);
+  service.publish_superblock(superblock);
+
   check_config();
 
   dout(10) << "ensuring pgs have consumed prior maps" << dendl;
@@ -1959,6 +1959,9 @@ int OSD::init()
 
   dout(0) << "done with init, starting boot process" << dendl;
   set_state(STATE_BOOTING);
+
+  // we don't need to ask for an osdmap here; objecter will
+
   start_boot();
 
   return 0;