From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Sat, 22 Jul 2017 02:30:05 +0000 (+0800)
Subject: osd/OSD: abort booting if osd is marked as destroyed
X-Git-Tag: v12.1.2~110^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c81097cfd9ad31b5b7d754800ce55985337c1a7d;p=ceph.git

osd/OSD: abort booting if osd is marked as destroyed

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index b29f9b87a4c4..3b8f7089fe5b 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -5679,6 +5679,9 @@ void OSD::_preboot(epoch_t oldest, epoch_t newest)
   // if our map within recent history, try to add ourselves to the osdmap.
   if (osdmap->get_epoch() == 0) {
     derr << "waiting for initial osdmap" << dendl;
+  } else if (osdmap->is_destroyed(whoami)) {
+    derr << "osdmap says I am destroyed, exiting" << dendl;
+    exit(0);
   } else if (osdmap->test_flag(CEPH_OSDMAP_NOUP) || osdmap->is_noup(whoami)) {
     derr << "osdmap NOUP flag is set, waiting for it to clear" << dendl;
   } else if (!osdmap->test_flag(CEPH_OSDMAP_SORTBITWISE)) {