From: Sage Weil <sage@inktank.com>
Date: Wed, 29 Jan 2014 14:40:29 +0000 (-0800)
Subject: keyvaluestore: name to keyvaluetore-dev for now
X-Git-Tag: v0.78~253
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5476b4b6ebe8dfcdb20c83d6b8f70595582d726e;p=ceph.git

keyvaluestore: name to keyvaluetore-dev for now

This helps warn the user that the ondisk format may be subject to change.

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

diff --git a/src/os/KeyValueStore.h b/src/os/KeyValueStore.h
index 23d9159a6400..6d08a13fef18 100644
--- a/src/os/KeyValueStore.h
+++ b/src/os/KeyValueStore.h
@@ -355,7 +355,7 @@ class KeyValueStore : public ObjectStore,
  public:
 
   KeyValueStore(const std::string &base,
-                const char *internal_name = "keyvaluestore",
+                const char *internal_name = "keyvaluestore-dev",
                 bool update_to=false);
   ~KeyValueStore();
 
diff --git a/src/os/ObjectStore.cc b/src/os/ObjectStore.cc
index 701dc31039ff..7496c4584185 100644
--- a/src/os/ObjectStore.cc
+++ b/src/os/ObjectStore.cc
@@ -32,7 +32,7 @@ ObjectStore *ObjectStore::create(CephContext *cct,
   if (type == "memstore") {
     return new MemStore(cct, data);
   }
-  if (type == "keyvaluestore") {
+  if (type == "keyvaluestore-dev") {
     return new KeyValueStore(data);
   }
   return NULL;
diff --git a/src/test/filestore/store_test.cc b/src/test/filestore/store_test.cc
index 7feb13fd59ee..8e88ab325e12 100644
--- a/src/test/filestore/store_test.cc
+++ b/src/test/filestore/store_test.cc
@@ -972,7 +972,7 @@ TEST_P(StoreTest, MoveRename) {
 INSTANTIATE_TEST_CASE_P(
   ObjectStore,
   StoreTest,
-  ::testing::Values("filestore", "keyvaluestore"));
+  ::testing::Values("filestore", "keyvaluestore-dev"));
 
 #else