]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/os/seastore: adjust select_log_omap_root to return a single root
authormyoungwon oh <ohmyoungwon@gmail.com>
Sat, 3 Jan 2026 06:59:33 +0000 (15:59 +0900)
committermyoungwon oh <ohmyoungwon@gmail.com>
Tue, 17 Mar 2026 08:04:24 +0000 (17:04 +0900)
Signed-off-by: Myoungwon Oh <ohmyoungwon@gmail.com>
src/crimson/os/seastore/seastore.cc

index a013057a07afffb64d2e214bfaad56dd4cf33c0f..aaa36a62b164b1e92d199c5b2df44c439834bc31 100644 (file)
@@ -1418,13 +1418,8 @@ SeaStore::Shard::omap_get_header(
 omap_root_t SeaStore::Shard::select_log_omap_root(Onode& onode) const
 {
   assert(store_active);
-  auto log_root = get_omap_root(omap_type_t::LOG, onode);
-  if (log_root.is_null()) {
-    return get_omap_root(omap_type_t::OMAP, onode);
-  } else {
-    ceph_assert(get_omap_root(omap_type_t::OMAP, onode).is_null());
-    return log_root;
-  }
+  // OMAP and LOG exclusively share the same omap_root
+  return get_omap_root(omap_type_t::OMAP, onode);
 }
 
 SeaStore::Shard::read_errorator::future<SeaStore::Shard::omap_values_t>