update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / test / objectstore / test_memstore_clone.cc

diff --git a/ceph/src/test/objectstore/test_memstore_clone.cc b/ceph/src/test/objectstore/test_memstore_clone.cc
index aa5374790ca23fd2836d437245840ba2e78ea107..85d4132949e8a3c90cc1843c8a2b8bbb73108194 100644 (file)
--- a/ceph/src/test/objectstore/test_memstore_clone.cc
+++ b/ceph/src/test/objectstore/test_memstore_clone.cc
@@ -16,7 +16,7 @@
 #include "common/ceph_argparse.h"
 #include "os/ObjectStore.h"
 #include <gtest/gtest.h>
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 #include "common/errno.h"
 #include "store_test_fixture.h"
 
@@ -44,13 +44,18 @@ public:
       return;
     }
     ObjectStore::Transaction t;
+    ch = store->create_new_collection(cid);
     t.create_collection(cid, 4);
-    unsigned r = store->apply_transaction(nullptr, std::move(t));
+    unsigned r = store->queue_transaction(ch, std::move(t));
     if (r != 0) {
       derr << "failed to create collection with " << cpp_strerror(r) << dendl;
     }
     ASSERT_EQ(0U, r);
   }
+  void TearDown() override {
+    ch.reset();
+    StoreTestFixture::TearDown();
+  }
 };
 
 // src 11[11 11 11 11]11
@@ -72,8 +77,8 @@ TEST_F(MemStoreClone, CloneRangeAllocated)
   t.write(cid, src, 0, 12, srcbl);
   t.write(cid, dst, 0, 12, dstbl);
   t.clone_range(cid, src, dst, 2, 8, 2);
-  ASSERT_EQ(0u, store->apply_transaction(nullptr, std::move(t)));
-  ASSERT_EQ(12, store->read(cid, dst, 0, 12, result));
+  ASSERT_EQ(0, store->queue_transaction(ch, std::move(t)));
+  ASSERT_EQ(12, store->read(ch, dst, 0, 12, result));
   ASSERT_EQ(expected, result);
 }
 
@@ -96,8 +101,8 @@ TEST_F(MemStoreClone, CloneRangeHole)
   t.write(cid, src, 12, 4, srcbl);
   t.write(cid, dst, 0, 12, dstbl);
   t.clone_range(cid, src, dst, 2, 8, 2);
-  ASSERT_EQ(0u, store->apply_transaction(nullptr, std::move(t)));
-  ASSERT_EQ(12, store->read(cid, dst, 0, 12, result));
+  ASSERT_EQ(0, store->queue_transaction(ch, std::move(t)));
+  ASSERT_EQ(12, store->read(ch, dst, 0, 12, result));
   ASSERT_EQ(expected, result);
 }
 
@@ -120,8 +125,8 @@ TEST_F(MemStoreClone, CloneRangeHoleStart)
   t.write(cid, src, 8, 4, srcbl);
   t.write(cid, dst, 0, 12, dstbl);
   t.clone_range(cid, src, dst, 2, 8, 2);
-  ASSERT_EQ(0u, store->apply_transaction(nullptr, std::move(t)));
-  ASSERT_EQ(12, store->read(cid, dst, 0, 12, result));
+  ASSERT_EQ(0, store->queue_transaction(ch, std::move(t)));
+  ASSERT_EQ(12, store->read(ch, dst, 0, 12, result));
   ASSERT_EQ(expected, result);
 }
 
@@ -145,8 +150,8 @@ TEST_F(MemStoreClone, CloneRangeHoleMiddle)
   t.write(cid, src, 8, 4, srcbl);
   t.write(cid, dst, 0, 12, dstbl);
   t.clone_range(cid, src, dst, 2, 8, 2);
-  ASSERT_EQ(0u, store->apply_transaction(nullptr, std::move(t)));
-  ASSERT_EQ(12, store->read(cid, dst, 0, 12, result));
+  ASSERT_EQ(0, store->queue_transaction(ch, std::move(t)));
+  ASSERT_EQ(12, store->read(ch, dst, 0, 12, result));
   ASSERT_EQ(expected, result);
 }
 
@@ -170,25 +175,26 @@ TEST_F(MemStoreClone, CloneRangeHoleEnd)
   t.write(cid, src, 12, 4, srcbl);
   t.write(cid, dst, 0, 12, dstbl);
   t.clone_range(cid, src, dst, 2, 8, 2);
-  ASSERT_EQ(0u, store->apply_transaction(nullptr, std::move(t)));
-  ASSERT_EQ(12, store->read(cid, dst, 0, 12, result));
+  ASSERT_EQ(0, store->queue_transaction(ch, std::move(t)));
+  ASSERT_EQ(12, store->read(ch, dst, 0, 12, result));
   ASSERT_EQ(expected, result);
 }
 
 int main(int argc, char** argv)
 {
   // default to memstore
-  vector<const char*> defaults{
-    "--osd_objectstore", "memstore",
-    "--osd_data", "msc.test_temp_dir",
-    "--memstore_page_size", "4",
+  map<string,string> defaults = {
+    { "osd_objectstore", "memstore" },
+    { "osd_data", "msc.test_temp_dir" },
+    { "memstore_page_size", "4" }
   };
 
   vector<const char*> args;
   argv_to_vec(argc, (const char **)argv, args);
 
   auto cct = global_init(&defaults, args, CEPH_ENTITY_TYPE_CLIENT,
-                        CODE_ENVIRONMENT_UTILITY, 0);
+                        CODE_ENVIRONMENT_UTILITY,
+                        CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);
   common_init_finish(g_ceph_context);
 
   ::testing::InitGoogleTest(&argc, argv);