From: Sage Weil <sage@inktank.com>
Date: Thu, 30 May 2013 22:53:35 +0000 (-0700)
Subject: fix test users of LevelDBStore
X-Git-Tag: v0.64~34
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=446e0770c77de5d72858dcf7a95c5b19f642cf98;p=ceph.git

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 b19745723e9d..e06a9ff9ecf1 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 e90094cb7c97..c4a5e384fcca 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 4365ff65b23a..1b39c8068fb9 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 10ebe1f3eb3b..4ab628928804 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 6be706d97b6f..4cfb8d11e2a6 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 49316b2fd906..aedc4c824e71 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;