From 05c5f8a802fb8f282dda3bf1e0b1830fb9aa41fc Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Wed, 8 May 2024 20:01:49 -0700 Subject: [PATCH] crimson/osd/ops_executor: use clone oi values in log entry The fields from the clone_obc oi are what we're actually trying to fill in here -- we might as well use them directly. Signed-off-by: Samuel Just (cherry picked from commit 207e5a6e9ba54deb2fb18d5a5ad432d42072453d) --- src/crimson/osd/ops_executer.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/crimson/osd/ops_executer.cc b/src/crimson/osd/ops_executer.cc index d8bfa7a361c..d170300379f 100644 --- a/src/crimson/osd/ops_executer.cc +++ b/src/crimson/osd/ops_executer.cc @@ -963,10 +963,10 @@ std::unique_ptr OpsExecuter::execute_clone( pg_log_entry_t::CLONE, coid, clone_obc->obs.oi.version, - initial_obs.oi.version, - initial_obs.oi.user_version, + clone_obc->obs.oi.prior_version, + clone_obc->obs.oi.user_version, osd_reqid_t(), - initial_obs.oi.mtime, // will be replaced in `apply_to()` + clone_obc->obs.oi.mtime, // will be replaced in `apply_to()` 0 }; encode(cloned_snaps, cloning_ctx->log_entry.snaps); -- 2.39.5