From: Sage Weil <sage@redhat.com>
Date: Mon, 30 Mar 2015 22:12:55 +0000 (-0700)
Subject: os/KeyValueDB: skip experimental check for test_init
X-Git-Tag: v9.0.0~66
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c7de236d2fc9890462b1a7f68c1fb7e21e22ae43;p=ceph.git

os/KeyValueDB: skip experimental check for test_init

We don't want to spit out the warning twice, and we don't have cct
anyway.

Also test_init is annoying; we should try to kill it.

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

diff --git a/src/os/KeyValueDB.cc b/src/os/KeyValueDB.cc
index d677facd2971..65ce487ed806 100644
--- a/src/os/KeyValueDB.cc
+++ b/src/os/KeyValueDB.cc
@@ -33,18 +33,16 @@ KeyValueDB *KeyValueDB::create(CephContext *cct, const string& type,
 
 int KeyValueDB::test_init(const string& type, const string& dir)
 {
-  if (type == "leveldb"){
+  if (type == "leveldb") {
     return LevelDBStore::_test_init(dir);
   }
 #ifdef HAVE_KINETIC
-  if (type == "kinetic" &&
-      cct->check_experimental_feature_enabled("kinetic")) {
+  if (type == "kinetic") {
     return KineticStore::_test_init(g_ceph_context);
   }
 #endif
 #ifdef HAVE_LIBROCKSDB
-  if (type == "rocksdb" &&
-      cct->check_experimental_feature_enabled("rocksdb")){
+  if (type == "rocksdb") {
     return RocksDBStore::_test_init(dir);
   }
 #endif