From: Sage Weil <sage@redhat.com>
Date: Fri, 7 Aug 2015 20:01:12 +0000 (-0400)
Subject: osd/OSDMap: add a SORTBITWISE OSDMap flag
X-Git-Tag: v9.1.0~346^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=968261b11ac30622c0606d1e2ddf422009e7d330;p=ceph.git

osd/OSDMap: add a SORTBITWISE OSDMap flag

This flag will indicate that hobject_t's shall hence-forth be
sorted in a bitwise fashion.

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

diff --git a/src/include/rados.h b/src/include/rados.h
index 424bef173b93..573db1726e45 100644
--- a/src/include/rados.h
+++ b/src/include/rados.h
@@ -143,6 +143,7 @@ extern const char *ceph_osd_state_name(int s);
 #define CEPH_OSDMAP_NODEEP_SCRUB (1<<12) /* block periodic deep-scrub */
 #define CEPH_OSDMAP_NOTIERAGENT (1<<13) /* disable tiering agent */
 #define CEPH_OSDMAP_NOREBALANCE (1<<14) /* block osd backfill unless pg is degraded */
+#define CEPH_OSDMAP_SORTBITWISE (1<<15) /* use bitwise hobject_t sort */
 
 /*
  * The error code to return when an OSD can't handle a write
diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index ddad99fb38a9..516796a10e2f 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -2368,6 +2368,8 @@ string OSDMap::get_flag_string(unsigned f)
     s += ",nodeep-scrub";
   if (f & CEPH_OSDMAP_NOTIERAGENT)
     s += ",notieragent";
+  if (f & CEPH_OSDMAP_SORTBITWISE)
+    s += ",sortbitwise";
   if (s.length())
     s.erase(0, 1);
   return s;