]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/osd/pg: remove slightly confusing assert from PG::submit_transaction
authorSamuel Just <sjust@redhat.com>
Thu, 9 May 2024 02:31:35 +0000 (19:31 -0700)
committerMatan Breizman <mbreizma@redhat.com>
Tue, 18 Jun 2024 07:27:03 +0000 (10:27 +0300)
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 <sjust@redhat.com>
(cherry picked from commit 7a04f6230d9376d155ac92a6c3bf1ab5eeca644f)

src/crimson/osd/pg.cc

index 457c98cf402caa7da122acfb7b212a8921cb789f..ad777c49d60118b66973abd10116d61196173294 100644 (file)
@@ -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();