From c6eb35b2b47a512779454ac91b1a0cd45c32b1bb Mon Sep 17 00:00:00 2001 From: Mark Nelson Date: Tue, 16 Apr 2024 13:58:09 +0000 Subject: [PATCH] osd/ECTransaction: Remove incorrect asserts in generate_transactions Back in PR #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 --- src/osd/ECTransaction.cc | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/osd/ECTransaction.cc b/src/osd/ECTransaction.cc index 8761189a5a80..59eed567e810 100644 --- a/src/osd/ECTransaction.cc +++ b/src/osd/ECTransaction.cc @@ -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); -- 2.47.3