From: Samuel Just Date: Thu, 9 May 2024 02:31:35 +0000 (-0700) Subject: crimson/osd/pg: remove slightly confusing assert from PG::submit_transaction X-Git-Tag: v19.1.1~217^2~4 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ecab9874d81d35baace484128234e0d0b51fc1dc;p=ceph.git crimson/osd/pg: remove slightly confusing assert from PG::submit_transaction This assert should always hold, so it's not wrong. However, osd_op_p.at_version is chosen during transaction construction time using the current epoch via PG::get_next_version. Asserting it here is more confusing than helpful. Signed-off-by: Samuel Just (cherry picked from commit 7a04f6230d9376d155ac92a6c3bf1ab5eeca644f) --- diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc index 457c98cf402c..ad777c49d601 100644 --- a/src/crimson/osd/pg.cc +++ b/src/crimson/osd/pg.cc @@ -813,7 +813,6 @@ PG::submit_transaction( } epoch_t map_epoch = get_osdmap_epoch(); - 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.update_trim_to();