]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #53521 from xxhdx1985126/wip-62857
authorKefu Chai <tchaikov@gmail.com>
Fri, 9 Feb 2024 15:11:18 +0000 (23:11 +0800)
committerGitHub <noreply@github.com>
Fri, 9 Feb 2024 15:11:18 +0000 (23:11 +0800)
crimson/osd/replicated_backend: don't put pg's metadata updates in repops

Reviewed-by: Samuel Just <sjust@redhat.com>
1  2 
src/crimson/osd/pg.cc
src/crimson/osd/pg_backend.cc
src/crimson/osd/pg_backend.h

index 1c997b71c5fc00dfc843ac14dd58ea8487da6c5a,2bd1bfc5bf3166fa81cd547c6ce913703561d73d..54c8101cd115be2db8972104045d06a291662b13
@@@ -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),
Simple merge
Simple merge