From: Samuel Just <sjust@redhat.com>
Date: Thu, 9 May 2024 03:01:49 +0000 (-0700)
Subject: crimson/osd/ops_executor: use clone oi values in log entry
X-Git-Tag: v19.1.1~217^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=05c5f8a802fb8f282dda3bf1e0b1830fb9aa41fc;p=ceph.git

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 <sjust@redhat.com>
(cherry picked from commit 207e5a6e9ba54deb2fb18d5a5ad432d42072453d)
---

diff --git a/src/crimson/osd/ops_executer.cc b/src/crimson/osd/ops_executer.cc
index d8bfa7a361c1..d170300379f6 100644
--- a/src/crimson/osd/ops_executer.cc
+++ b/src/crimson/osd/ops_executer.cc
@@ -963,10 +963,10 @@ std::unique_ptr<OpsExecuter::CloningContext> 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);