From: David Zafman <david.zafman@inktank.com>
Date: Thu, 19 Dec 2013 18:35:39 +0000 (-0800)
Subject: osd: Remove redundant incompat feature
X-Git-Tag: v0.77~23^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b780f4bf3f2a9b56798fd9a55888291e22ef1352;p=ceph.git

osd: Remove redundant incompat feature

We can remove this CompatSet bit without worry because the only
way it could have been set is if an erasure coded pool was create.
This isn't supported as of yet.

Signed-off-by: David Zafman <david.zafman@inktank.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 6bef0d2025f4..1e3e980e8fc6 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -163,7 +163,6 @@ CompatSet OSD::get_osd_compat_set() {
   CompatSet compat =  get_osd_initial_compat_set();
   //Any features here can be set in code, but not in initial superblock
   compat.incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_SHARDS);
-  compat.incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_ERASURECODES);
   return compat;
 }
 
@@ -5380,9 +5379,9 @@ void OSD::check_osdmap_features()
   }
 
   if ((features & CEPH_FEATURE_OSD_ERASURE_CODES) &&
-      (!superblock.compat_features.incompat.contains(CEPH_OSD_FEATURE_INCOMPAT_ERASURECODES))) {
+      (!superblock.compat_features.incompat.contains(CEPH_OSD_FEATURE_INCOMPAT_SHARDS))) {
     dout(0) << __func__ << " enabling on-disk ERASURE CODES compat feature" << dendl;
-    superblock.compat_features.incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_ERASURECODES);
+    superblock.compat_features.incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_SHARDS);
     ObjectStore::Transaction t;
     write_superblock(t);
     int err = store->apply_transaction(t);
diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index 96dbced277a8..49de460bb173 100644
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -47,7 +47,6 @@
 #define CEPH_OSD_FEATURE_INCOMPAT_LEVELDBLOG CompatSet::Feature(9, "leveldblog")
 #define CEPH_OSD_FEATURE_INCOMPAT_SNAPMAPPER CompatSet::Feature(10, "snapmapper")
 #define CEPH_OSD_FEATURE_INCOMPAT_SHARDS CompatSet::Feature(11, "sharded objects")
-#define CEPH_OSD_FEATURE_INCOMPAT_ERASURECODES CompatSet::Feature(12, "erasure codes")
 
 
 typedef hobject_t collection_list_handle_t;