summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-05-30 15:53:35 -0700
committerSage Weil <sage@inktank.com>2013-06-02 14:09:51 -0700
commit48ee9283de288c101d3387cc48df6eb8ea889fb7 (patch)
tree9c62f3297089046efadb5554f809270a8102a86d
parent3372235d307172b404a48e4c4d24702a96116d00 (diff)
downloadceph-48ee9283de288c101d3387cc48df6eb8ea889fb7.tar.gz
fix test users of LevelDBStore
Need to pass in cct. Signed-off-by: Sage Weil <sage@inktank.com> (cherry picked from commit 446e0770c77de5d72858dcf7a95c5b19f642cf98)
-rw-r--r--src/test/ObjectMap/test_keyvaluedb_atomicity.cc2
-rw-r--r--src/test/ObjectMap/test_keyvaluedb_iterators.cc2
-rw-r--r--src/test/ObjectMap/test_object_map.cc2
-rw-r--r--src/test/ObjectMap/test_store_tool/test_store_tool.cc2
-rw-r--r--src/test/filestore/test_idempotent.cc2
-rw-r--r--src/tools/ceph-osdomap-tool.cc2
6 files changed, 6 insertions, 6 deletions
diff --git a/src/test/ObjectMap/test_keyvaluedb_atomicity.cc b/src/test/ObjectMap/test_keyvaluedb_atomicity.cc
index b19745723e9..e06a9ff9ecf 100644
--- a/src/test/ObjectMap/test_keyvaluedb_atomicity.cc
+++ b/src/test/ObjectMap/test_keyvaluedb_atomicity.cc
@@ -84,7 +84,7 @@ int main() {
}
string strpath(path);
std::cerr << "Using path: " << strpath << std::endl;
- LevelDBStore *store = new LevelDBStore(strpath);
+ LevelDBStore *store = new LevelDBStore(NULL, strpath);
assert(!store->create_and_open(std::cerr));
db.reset(store);
diff --git a/src/test/ObjectMap/test_keyvaluedb_iterators.cc b/src/test/ObjectMap/test_keyvaluedb_iterators.cc
index e90094cb7c9..c4a5e384fcc 100644
--- a/src/test/ObjectMap/test_keyvaluedb_iterators.cc
+++ b/src/test/ObjectMap/test_keyvaluedb_iterators.cc
@@ -37,7 +37,7 @@ public:
virtual void SetUp() {
assert(!store_path.empty());
- LevelDBStore *db_ptr = new LevelDBStore(store_path);
+ LevelDBStore *db_ptr = new LevelDBStore(g_ceph_context, store_path);
assert(!db_ptr->create_and_open(std::cerr));
db.reset(db_ptr);
mock.reset(new KeyValueDBMemory());
diff --git a/src/test/ObjectMap/test_object_map.cc b/src/test/ObjectMap/test_object_map.cc
index 4365ff65b23..1b39c8068fb 100644
--- a/src/test/ObjectMap/test_object_map.cc
+++ b/src/test/ObjectMap/test_object_map.cc
@@ -518,7 +518,7 @@ public:
string strpath(path);
cerr << "using path " << strpath << std::endl;;
- LevelDBStore *store = new LevelDBStore(strpath);
+ LevelDBStore *store = new LevelDBStore(g_ceph_context, strpath);
assert(!store->create_and_open(cerr));
db.reset(new DBObjectMap(store));
diff --git a/src/test/ObjectMap/test_store_tool/test_store_tool.cc b/src/test/ObjectMap/test_store_tool/test_store_tool.cc
index 10ebe1f3eb3..4ab62892880 100644
--- a/src/test/ObjectMap/test_store_tool/test_store_tool.cc
+++ b/src/test/ObjectMap/test_store_tool/test_store_tool.cc
@@ -27,7 +27,7 @@ class StoreTool
public:
StoreTool(const string &path) {
- LevelDBStore *db_ptr = new LevelDBStore(path);
+ LevelDBStore *db_ptr = new LevelDBStore(g_ceph_context, path);
assert(!db_ptr->open(std::cerr));
db.reset(db_ptr);
}
diff --git a/src/test/filestore/test_idempotent.cc b/src/test/filestore/test_idempotent.cc
index 6be706d97b6..4cfb8d11e2a 100644
--- a/src/test/filestore/test_idempotent.cc
+++ b/src/test/filestore/test_idempotent.cc
@@ -63,7 +63,7 @@ int main(int argc, char **argv) {
bool start_new = false;
if (string(args[0]) == string("new")) start_new = true;
- LevelDBStore *_db = new LevelDBStore(db_path);
+ LevelDBStore *_db = new LevelDBStore(g_ceph_context, db_path);
assert(!_db->create_and_open(std::cerr));
boost::scoped_ptr<KeyValueDB> db(_db);
boost::scoped_ptr<ObjectStore> store(new FileStore(store_path, store_dev));
diff --git a/src/tools/ceph-osdomap-tool.cc b/src/tools/ceph-osdomap-tool.cc
index 49316b2fd90..aedc4c824e7 100644
--- a/src/tools/ceph-osdomap-tool.cc
+++ b/src/tools/ceph-osdomap-tool.cc
@@ -87,7 +87,7 @@ int main(int argc, char **argv) {
return 1;
}
- LevelDBStore* store(new LevelDBStore(store_path));
+ LevelDBStore* store(new LevelDBStore(g_ceph_context, store_path));
if (paranoid) {
std::cerr << "Enabling paranoid checks" << std::endl;
store->options.paranoid_checks = paranoid;