From: Kefu Chai Date: Fri, 9 Feb 2024 15:11:18 +0000 (+0800) Subject: Merge pull request #53521 from xxhdx1985126/wip-62857 X-Git-Tag: testing/wip-batrick-testing-20240411.154038~468 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f8e4e33149503a4664c38991dbd1f06944558b53;p=ceph-ci.git Merge pull request #53521 from xxhdx1985126/wip-62857 crimson/osd/replicated_backend: don't put pg's metadata updates in repops Reviewed-by: Samuel Just --- f8e4e33149503a4664c38991dbd1f06944558b53 diff --cc src/crimson/osd/pg.cc index 1c997b71c5f,2bd1bfc5bf3..54c8101cd11 --- a/src/crimson/osd/pg.cc +++ b/src/crimson/osd/pg.cc @@@ -757,13 -762,8 +758,12 @@@ PG::submit_transaction ceph_assert(!has_reset_since(osd_op_p.at_version.epoch)); peering_state.pre_submit_op(obc->obs.oi.soid, log_entries, osd_op_p.at_version); - peering_state.append_log_with_trim_to_updated(std::move(log_entries), osd_op_p.at_version, - txn, true, false); + peering_state.update_trim_to(); + ceph_assert(!log_entries.empty()); + ceph_assert(log_entries.rbegin()->version >= projected_last_update); + projected_last_update = log_entries.rbegin()->version; + auto [submitted, all_completed] = backend->mutate_object( peering_state.get_acting_recovery_backfill(), std::move(obc),