update ceph source to reef 18.1.2

[ceph.git] / ceph / src / test / crimson / seastore / onode_tree / test_fltree_onode_manager.cc

diff --git a/ceph/src/test/crimson/seastore/onode_tree/test_fltree_onode_manager.cc b/ceph/src/test/crimson/seastore/onode_tree/test_fltree_onode_manager.cc
index c91e13e511b2700eed3412018867346502090ac1..64afe1247caacb2ff04d1fb0708f831cd5885d73 100644 (file)
--- a/ceph/src/test/crimson/seastore/onode_tree/test_fltree_onode_manager.cc
+++ b/ceph/src/test/crimson/seastore/onode_tree/test_fltree_onode_manager.cc
@@ -26,20 +26,22 @@ namespace {
 struct onode_item_t {
   uint32_t size;
   uint64_t id;
+  uint64_t block_size;
   uint32_t cnt_modify = 0;
 
   void initialize(Transaction& t, Onode& value) const {
     auto& layout = value.get_mutable_layout(t);
     layout.size = size;
-    layout.omap_root.update(omap_root_t(id, cnt_modify, value.get_metadata_hint()));
+    layout.omap_root.update(omap_root_t(id, cnt_modify,
+      value.get_metadata_hint(block_size)));
     validate(value);
   }
 
   void validate(Onode& value) const {
     auto& layout = value.get_layout();
     ceph_assert(laddr_t(layout.size) == laddr_t{size});
-    ceph_assert(layout.omap_root.get(value.get_metadata_hint()).addr == id);
-    ceph_assert(layout.omap_root.get(value.get_metadata_hint()).depth == cnt_modify);
+    ceph_assert(layout.omap_root.get(value.get_metadata_hint(block_size)).addr == id);
+    ceph_assert(layout.omap_root.get(value.get_metadata_hint(block_size)).depth == cnt_modify);
   }
 
   void modify(Transaction& t, Onode& value) {
@@ -48,9 +50,9 @@ struct onode_item_t {
     initialize(t, value);
   }
 
-  static onode_item_t create(std::size_t size, std::size_t id) {
+  static onode_item_t create(std::size_t size, std::size_t id, uint64_t block_size) {
     ceph_assert(size <= std::numeric_limits<uint32_t>::max());
-    return {(uint32_t)size, id};
+    return {(uint32_t)size, id, block_size};
   }
 };
 
@@ -68,40 +70,38 @@ struct fltree_onode_manager_test_t
     return tm_teardown();
   }
 
-
-  virtual void _init() final {
-    TMTestState::_init();
-    manager.reset(new FLTreeOnodeManager(*tm));
+  virtual seastar::future<> _init() final {
+    return TMTestState::_init().then([this] {
+      manager.reset(new FLTreeOnodeManager(*tm));
+    });
   }
 
-  virtual void _destroy() final {
+  virtual seastar::future<> _destroy() final {
     manager.reset();
-    TMTestState::_destroy();
+    return TMTestState::_destroy();
   }
 
   virtual FuturizedStore::mkfs_ertr::future<> _mkfs() final {
     return TMTestState::_mkfs(
     ).safe_then([this] {
-      return tm->mount(
-      ).safe_then([this] {
-       return repeat_eagain([this] {
-         return seastar::do_with(
-           create_mutate_transaction(),
-           [this](auto &ref_t) {
-             return with_trans_intr(*ref_t, [&](auto &t) {
-               return manager->mkfs(t
-               ).si_then([this, &t] {
-                 return submit_transaction_fut2(t);
-               });
-             });
-         });
-       });
-      }).safe_then([this] {
-       return tm->close();
-      }).handle_error(
-       crimson::ct_error::assert_all{"Invalid error in _mkfs"}
-      );
-    });
+      return restart_fut();
+    }).safe_then([this] {
+      return repeat_eagain([this] {
+        return seastar::do_with(
+          create_mutate_transaction(),
+          [this](auto &ref_t)
+        {
+          return with_trans_intr(*ref_t, [&](auto &t) {
+            return manager->mkfs(t
+            ).si_then([this, &t] {
+              return submit_transaction_fut2(t);
+            });
+          });
+        });
+      });
+    }).handle_error(
+      crimson::ct_error::assert_all{"Invalid error in _mkfs"}
+    );
   }
 
   template <typename F>
@@ -109,7 +109,6 @@ struct fltree_onode_manager_test_t
     auto t = create_mutate_transaction();
     std::invoke(f, *t);
     submit_transaction(std::move(t));
-    segment_cleaner->run_until_halt().get0();
   }
 
   template <typename F>
@@ -239,7 +238,8 @@ struct fltree_onode_manager_test_t
 TEST_F(fltree_onode_manager_test_t, 1_single)
 {
   run_async([this] {
-    auto pool = KVPool<onode_item_t>::create_range({0, 1}, {128, 256});
+    uint64_t block_size = tm->get_block_size();
+    auto pool = KVPool<onode_item_t>::create_range({0, 1}, {128, 256}, block_size);
     auto iter = pool.begin();
     with_onode_write(iter, [](auto& t, auto& onode, auto& item) {
       item.initialize(t, onode);
@@ -266,8 +266,9 @@ TEST_F(fltree_onode_manager_test_t, 1_single)
 TEST_F(fltree_onode_manager_test_t, 2_synthetic)
 {
   run_async([this] {
+    uint64_t block_size = tm->get_block_size();
     auto pool = KVPool<onode_item_t>::create_range(
-        {0, 100}, {32, 64, 128, 256, 512});
+        {0, 100}, {32, 64, 128, 256, 512}, block_size);
     auto start = pool.begin();
     auto end = pool.end();
     with_onodes_write(start, end,