From: Sage Weil <sage@redhat.com>
Date: Wed, 19 Apr 2017 13:33:33 +0000 (-0400)
Subject: os: remove experimental status for BlueStore
X-Git-Tag: v12.1.0~10^2~7^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=036470a2a062077c6a5340a1de8dbdefde2ceb75;p=ceph.git

os: remove experimental status for BlueStore

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

diff --git a/qa/objectstore/bluestore-comp.yaml b/qa/objectstore/bluestore-comp.yaml
index 6c466bed68a3..f49e4bcb073e 100644
--- a/qa/objectstore/bluestore-comp.yaml
+++ b/qa/objectstore/bluestore-comp.yaml
@@ -12,7 +12,6 @@ overrides:
         debug bdev: 20
         debug bluefs: 20
         debug rocksdb: 10
-        enable experimental unrecoverable data corrupting features: "*"
         bluestore compression mode: aggressive
 
 # this doesn't work with failures bc the log writes are not atomic across the two backends
diff --git a/qa/objectstore/bluestore.yaml b/qa/objectstore/bluestore.yaml
index 361dae308dea..61f5754d446e 100644
--- a/qa/objectstore/bluestore.yaml
+++ b/qa/objectstore/bluestore.yaml
@@ -12,6 +12,5 @@ overrides:
         debug bdev: 20
         debug bluefs: 20
         debug rocksdb: 10
-        enable experimental unrecoverable data corrupting features: "*"
 # this doesn't work with failures bc the log writes are not atomic across the two backends
 #        bluestore bluefs env mirror: true
diff --git a/src/os/ObjectStore.cc b/src/os/ObjectStore.cc
index 207472e341c1..93c79667d4f1 100644
--- a/src/os/ObjectStore.cc
+++ b/src/os/ObjectStore.cc
@@ -73,12 +73,10 @@ ObjectStore *ObjectStore::create(CephContext *cct,
     return new MemStore(cct, data);
   }
 #if defined(HAVE_LIBAIO)
-  if (type == "bluestore" &&
-      cct->check_experimental_feature_enabled("bluestore")) {
+  if (type == "bluestore") {
     return new BlueStore(cct, data);
   }
-  if (type == "random" &&
-      cct->check_experimental_feature_enabled("bluestore")) {
+  if (type == "random") {
     if (rand() % 2) {
       return new FileStore(cct, data, journal, flags);
     } else {