From 96c11d26c9e61c76840dda33eabc489767125648 Mon Sep 17 00:00:00 2001 From: Xuehan Xu Date: Tue, 29 Aug 2023 14:05:02 +0800 Subject: [PATCH] crimson/osd/ops_executor: queue pg log entry for CLONE at the front This is consistent with the order of ops in ceph::os::Transaction Signed-off-by: Xuehan Xu --- src/crimson/osd/ops_executer.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/crimson/osd/ops_executer.cc b/src/crimson/osd/ops_executer.cc index 868a7a3fb13..09b1a492576 100644 --- a/src/crimson/osd/ops_executer.cc +++ b/src/crimson/osd/ops_executer.cc @@ -970,7 +970,7 @@ void OpsExecuter::CloningContext::apply_to( ObjectContext& processed_obc) && { log_entry.mtime = processed_obc.obs.oi.mtime; - log_entries.emplace_back(std::move(log_entry)); + log_entries.insert(log_entries.begin(), std::move(log_entry)); processed_obc.ssc->snapset = std::move(new_snapset); } @@ -985,7 +985,7 @@ OpsExecuter::flush_clone_metadata( auto maybe_snap_mapped = interruptor::now(); if (cloning_ctx) { std::move(*cloning_ctx).apply_to(log_entries, *obc); - const auto& coid = log_entries.back().soid; + const auto& coid = log_entries.front().soid; const auto& cloned_snaps = obc->ssc->snapset.clone_snaps[coid.snap]; maybe_snap_mapped = snap_map_clone( coid, -- 2.39.5