test/crimson/seastore: adjust existing test based on two omap trees

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>

diff --git a/src/test/crimson/seastore/onode_tree/test_fltree_onode_manager.cc b/src/test/crimson/seastore/onode_tree/test_fltree_onode_manager.cc
index b3a915565afdc3628176a789911800c876b94286..f91914f482a95bb6105f1641f763cb9bb699c34b 100644 (file)
--- a/src/test/crimson/seastore/onode_tree/test_fltree_onode_manager.cc
+++ b/src/test/crimson/seastore/onode_tree/test_fltree_onode_manager.cc
@@ -33,7 +33,7 @@ struct onode_item_t {
     auto &ftvalue = static_cast<FLTreeOnode&>(value);
     ftvalue.update_onode_size(t, size);
     auto oroot = omap_root_t(laddr_t::from_raw_uint(id), cnt_modify,
-      value.get_metadata_hint(block_size));
+      value.get_metadata_hint(block_size), omap_type_t::OMAP);
     ftvalue.update_omap_root(t, oroot);
     validate(value);
   }

diff --git a/src/test/crimson/seastore/test_object_data_handler.cc b/src/test/crimson/seastore/test_object_data_handler.cc
index a6233ad2c63fad3c99c192f86e7f82a6d76a45ec..4c4973fac64f610c8a36e02bfd718b1475cfb3dd 100644 (file)
--- a/src/test/crimson/seastore/test_object_data_handler.cc
+++ b/src/test/crimson/seastore/test_object_data_handler.cc
@@ -53,6 +53,12 @@ public:
     });
   }
 
+  void update_log_root(Transaction &t, omap_root_t &lroot) final {
+    with_mutable_layout(t, [&lroot](onode_layout_t &mlayout) {
+      mlayout.log_root.update(lroot);
+    });
+  }
+
   void update_xattr_root(Transaction &t, omap_root_t &xroot) final {
     with_mutable_layout(t, [&xroot](onode_layout_t &mlayout) {
       mlayout.xattr_root.update(xroot);

diff --git a/src/test/crimson/seastore/test_omap_manager.cc b/src/test/crimson/seastore/test_omap_manager.cc
index b9072fd7bc47f50c32b1f88eb0f5cf21854a5fec..b2c7307f09a8edb73d4abac06485777b49810661 100644 (file)
--- a/src/test/crimson/seastore/test_omap_manager.cc
+++ b/src/test/crimson/seastore/test_omap_manager.cc
@@ -273,7 +273,8 @@ struct omap_manager_test_t :
     omap_root_t omap_root = with_trans_intr(
       *t,
       [this](auto &t) {
-       return omap_manager->initialize_omap(t, L_ADDR_MIN);
+       return omap_manager->initialize_omap(t, L_ADDR_MIN,
+         omap_type_t::OMAP);
       }).unsafe_get();
     submit_transaction(std::move(t));
     return omap_root;