Skip to content

Commit

Permalink
osd/ECTransaction: Remove incorrect asserts in generate_transactions
Browse files Browse the repository at this point in the history
Back in PR ceph#11701 when EC Overwrites were added, there was significant churn in the ECTransaction code.  Several asserts were added in generate_transactions, but the code changed several times and it appears some of those asserts don't make sense in the final version of the PR.

This PR removes two of those asserts.  The first doesn't appear to be necessary given how the surrounding conditional block changed.   The second appears to be an incorrect assert that was left over from an earlier commit that no longer should be in place given the logic that was added to handle truncate (which roughly mirrors what we do in ReplicatedBackend).

It's possible the assert for obc and entry are also unnecessary, however I left those in place for now.

Fixes: https://tracker.ceph.com/issues/65509

Signed-off-by: Mark Nelson <[email protected]>
  • Loading branch information
Mark Nelson committed Apr 16, 2024
1 parent 117f85b commit c6eb35b
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions src/osd/ECTransaction.cc
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,6 @@ void ECTransaction::generate_transactions(
xattr_rollback[ECUtil::get_hinfo_key()] = old_hinfo;

if (op.is_none() && op.truncate && op.truncate->first == 0) {
ceph_assert(op.truncate->first == 0);
ceph_assert(op.truncate->first ==
op.truncate->second);
ceph_assert(entry);
ceph_assert(obc);

Expand Down

0 comments on commit c6eb35b

Please sign in to comment.