From 4cc0f2f42c1faac956d5e0344912b18241095198 Mon Sep 17 00:00:00 2001 From: Haomai Wang Date: Tue, 26 May 2015 12:40:19 +0800 Subject: [PATCH] KeyValueStore: Add collect_metadata support Signed-off-by: Haomai Wang --- src/os/KeyValueStore.cc | 5 +++++ src/os/KeyValueStore.h | 4 +++- src/test/objectstore/store_test.cc | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/os/KeyValueStore.cc b/src/os/KeyValueStore.cc index 1204a692c7cee..94092ae8bc22e 100644 --- a/src/os/KeyValueStore.cc +++ b/src/os/KeyValueStore.cc @@ -583,6 +583,11 @@ int KeyValueStore::statfs(struct statfs *buf) return 0; } +void KeyValueStore::collect_metadata(map *pm) +{ + (*pm)["keyvaluestore_backend"] = superblock.backend; +} + int KeyValueStore::mkfs() { int ret = 0; diff --git a/src/os/KeyValueStore.h b/src/os/KeyValueStore.h index 376a37097ce39..0bf69e75a9a14 100644 --- a/src/os/KeyValueStore.h +++ b/src/os/KeyValueStore.h @@ -474,7 +474,7 @@ class KeyValueStore : public ObjectStore, public: KeyValueStore(const std::string &base, - const char *internal_name = "keyvaluestore-dev", + const char *internal_name = "keyvaluestore", bool update_to=false); ~KeyValueStore(); @@ -524,6 +524,8 @@ class KeyValueStore : public ObjectStore, **/ bool get_allow_sharded_objects() {return false;} + void collect_metadata(map *pm); + int statfs(struct statfs *buf); int _do_transactions( diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc index 7f355d5b2f890..9e31615f136b4 100644 --- a/src/test/objectstore/store_test.cc +++ b/src/test/objectstore/store_test.cc @@ -81,6 +81,8 @@ TEST_P(StoreTest, collect_metadata) { if (GetParam() == string("filestore")) { ASSERT_NE(pm.count("filestore_backend"), 0u); ASSERT_NE(pm.count("filestore_f_type"), 0u); + } else if (GetParam() == string("keyvaluestore")) { + ASSERT_NE(pm.count("keyvaluestore_backend"), 0u); } } -- 2.47.3