fix test users of LevelDBStore

Need to pass in cct.

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

diff --git a/src/test/ObjectMap/test_keyvaluedb_atomicity.cc b/src/test/ObjectMap/test_keyvaluedb_atomicity.cc
index b19745723e9d2270a82366d862b82e0e9a37a425..e06a9ff9ecf167f9d37c469e2fc496113d6babb9 100644 (file)
--- 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 e90094cb7c97048da3e0c481c7a70c69f9c37c7d..c4a5e384fccae3aab8dfda4c1a3a54366a253340 100644 (file)
--- 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 4365ff65b23a7bd5da571f0416c7ef733bb3c001..1b39c8068fb93b633d3423398dd3feaf2074a085 100644 (file)
--- 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 10ebe1f3eb3b87b08328c50bc7b776e0ab996058..4ab6289288042062efafb06a124a962c0a80d247 100644 (file)
--- 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 6be706d97b6fcef013886fd024def6c2cb651a80..4cfb8d11e2a671d9ce38f8b3eabe45230622b03a 100644 (file)
--- 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 49316b2fd90688adc70e9bdbd79bdac990df62a5..aedc4c824e71c3a0bf6e366d1dd33e933d1f7fd9 100644 (file)
--- 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;