From: Sage Weil <sage@redhat.com>
Date: Mon, 29 Dec 2014 19:36:36 +0000 (-0800)
Subject: os: rename keyvaluestore-dev -> keyvaluestore; mark experimental
X-Git-Tag: v0.92~88^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=44ce7cc1de774a74b669df408051ec1877a45877;p=ceph.git

os: rename keyvaluestore-dev -> keyvaluestore; mark experimental

Use a clean name for keyvaluestore (no -dev suffix), but mark as
experimental to ensure users know what they are signing up for.

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

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index ae3b5b184ba4..727c584f00fe 100644
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -37,3 +37,11 @@ v0.91
 
 v0.92
 -----
+
+* The experiemental 'keyvaluestore-dev' OSD backend has been renamed
+  'keyvaluestore' (for simplicity) and marked as experimental.  To
+  enable this untested feature and acknowledge that you understand
+  that it is untested and may destroy data, you need to add the
+  following to your ceph.conf::
+
+    enable experimental unrecoverable data corrupting featuers = keyvaluestore
diff --git a/src/os/ObjectStore.cc b/src/os/ObjectStore.cc
index 2e26e39efd30..5869be535c02 100644
--- a/src/os/ObjectStore.cc
+++ b/src/os/ObjectStore.cc
@@ -33,7 +33,8 @@ ObjectStore *ObjectStore::create(CephContext *cct,
   if (type == "memstore") {
     return new MemStore(cct, data);
   }
-  if (type == "keyvaluestore-dev") {
+  if (type == "keyvaluestore" &&
+      cct->check_experimental_feature_enabled("keyvaluestore")) {
     return new KeyValueStore(data);
   }
   return NULL;