]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
os/KeyValueDB: skip experimental check for test_init
authorSage Weil <sage@redhat.com>
Mon, 30 Mar 2015 22:12:55 +0000 (15:12 -0700)
committerSage Weil <sage@redhat.com>
Mon, 30 Mar 2015 22:14:15 +0000 (15:14 -0700)
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>
src/os/KeyValueDB.cc

index d677facd29715197a60285ec026b43fd6c5d8fb9..65ce487ed8065a9c1a85609eff12b2c8914bdf0f 100644 (file)
@@ -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