mvanhorn commented on code in PR #11102:
URL: https://github.com/apache/paimon/pull/11102#discussion_r4645415625
##########
paimon-core/src/main/java/org/apache/paimon/operation/FileStoreCommitImpl.java:
##########
@@ -1386,13 +1615,21 @@ private CommitResult tryCommitOnceWithoutLock(
}
// Check snapshot history even when the file-level conflict scan can
be skipped.
- List<BinaryRow> changedPartitions =
- snapshotConflictChecker.check(
- newSnapshotId,
- commitKind,
- changes,
- rebasedReassignments,
- compactionBaselines);
+ List<BinaryRow> changedPartitions;
+ try {
+ changedPartitions =
+ snapshotConflictChecker.check(
+ newSnapshotId,
+ commitKind,
+ changes,
+ rebasedReassignments,
+ compactionBaselines);
+ } catch (BucketCompactionConflictException e) {
Review Comment:
Done in 1c351b96336d12014c09de1565179d7d41d0c4ad: when the snapshots after a
recovered COMPACT's baseline have expired, checkBucketCompaction now throws
BucketCompactionConflictException so tryCommitCompact skips that recovery with
a warning and keeps the APPEND, while other snapshot read failures still
propagate, and I added a test for your sequence (prepared on the baseline,
foreign empty APPEND, own APPEND, older snapshots expired, two fresh
restorations). The same push makes recoverCompact skip the compact phase with a
warning when the bucket check is on and a compaction message has a null
checkFromSnapshot (older serialized messages), while ordinary commits still
reject it in prepareCompactionBaselines, with a test using the DV recovery
fixture. It also reads the index manifest outside the catch in
ConflictDetection.checkConflicts so an I/O failure propagates instead of
becoming a stale-recovery conflict, with tests in ConflictDetectionTest and
FileStoreCommitRecoveryTest.
<!-- r:35439cf10f71.12bce45543c2 -->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]