]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/osd/ops_executor: use clone oi values in log entry
authorSamuel Just <sjust@redhat.com>
Thu, 9 May 2024 03:01:49 +0000 (20:01 -0700)
committerMatan Breizman <mbreizma@redhat.com>
Tue, 18 Jun 2024 07:27:11 +0000 (10:27 +0300)
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)

src/crimson/osd/ops_executer.cc

index d8bfa7a361c1a000b9b8bc835cf6d6d4209b1acf..d170300379f646e0f1a304df0cf675d4dfc5afde 100644 (file)
@@ -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);