]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.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>
Thu, 19 Feb 2026 07:31:48 +0000 (16:31 +0900)
Signed-off-by: Myoungwon Oh <ohmyoungwon@gmail.com>
src/crimson/os/seastore/seastore.cc

index e3b8eaaba3b811929d9435d8e37efae50ff47b12..b87354782bc79bb9f8d60378bd9733a752dbe1a5 100644 (file)
@@ -1290,13 +1290,8 @@ SeaStore::Shard::omap_get_header(
 
 omap_root_t SeaStore::Shard::select_log_omap_root(Onode& onode) const
 {
-  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>