From: Xiaoxi Chen <xiaoxi.chen@intel.com>
Date: Thu, 12 Nov 2015 05:46:58 +0000 (+0800)
Subject: osd: check do_shutdown before do_restart
X-Git-Tag: v10.0.1~65^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F6547%2Fhead;p=ceph.git

osd: check do_shutdown before do_restart

This will save extart boot message when do_shutdown && do_restart == true,
which is the case when rebind failed.

Also move the unlock/lock inside the if statement so we don't do unnecessary
lock/unlock.

Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 0562eed8f3a8..ae028a225c0a 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -6544,16 +6544,17 @@ void OSD::handle_osd_map(MOSDMap *m)
     dout(10) << " msg say newest map is " << m->newest_map << ", requesting more" << dendl;
     osdmap_subscribe(osdmap->get_epoch()+1, true);
   }
+  else if (do_shutdown) {
+    osd_lock.Unlock();
+    shutdown();
+    osd_lock.Lock();
+  }
   else if (is_booting()) {
     start_boot();  // retry
   }
   else if (do_restart)
     start_boot();
 
-  osd_lock.Unlock();
-  if (do_shutdown)
-    shutdown();
-  osd_lock.Lock();
 
   m->put();
 }