From: Sage Weil <sage@redhat.com>
Date: Wed, 8 Feb 2017 19:45:40 +0000 (-0500)
Subject: osd: shutdown if sortbitwise flag is ever cleared
X-Git-Tag: v12.0.1~427^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ea8b17035e19e263772520d7333812c8b205db8c;p=ceph.git

osd: shutdown if sortbitwise flag is ever cleared

Note we do this only in activate_map so that we can (while booting)
skip past maps that don't have it set.

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 46a712e87dce..7fb576762756 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -7572,6 +7572,11 @@ void OSD::activate_map()
 
   dout(7) << "activate_map version " << osdmap->get_epoch() << dendl;
 
+  if (!osdmap->test_flag(CEPH_OSDMAP_SORTBITWISE)) {
+    derr << __func__ << " SORTBITWISE flag is not set" << dendl;
+    ceph_abort();
+  }
+
   if (osdmap->test_flag(CEPH_OSDMAP_FULL)) {
     dout(10) << " osdmap flagged full, doing onetime osdmap subscribe" << dendl;
     osdmap_subscribe(osdmap->get_epoch() + 1, false);