Skip to content

revert(s3wal): handle hollow after trim #3059

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 26, 2025
Merged

revert(s3wal): handle hollow after trim #3059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions s3stream/src/main/java/com/automq/stream/s3/wal/impl/object/RecoverIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
import static com.automq.stream.s3.wal.common.RecordHeader.RECORD_HEADER_SIZE;
import static com.automq.stream.s3.wal.common.RecordHeader.RECORD_HEADER_WITHOUT_CRC_SIZE;

@SuppressWarnings("NPathComplexity")
public class RecoverIterator implements Iterator<RecoverResult> {
private static final Logger LOGGER = LoggerFactory.getLogger(RecoverIterator.class);
private final ObjectStorage objectStorage;
Expand Down Expand Up @@ -126,13 +125,6 @@ static List<WALObject> getContinuousFromTrimOffset(List<WALObject> objectList, l
return Collections.emptyList();
}

if (trimOffset != -1 && objectList.get(startIndex).startOffset() > trimOffset) {
for (int i = startIndex; i < objectList.size(); i++) {
LOGGER.warn("There is hollow before trim offset, drop discontinuous object: {}", objectList.get(i));
}
return Collections.emptyList();
}

int endIndex = startIndex + 1;
for (int i = startIndex + 1; i < objectList.size(); i++) {
if (objectList.get(i).startOffset() != objectList.get(i - 1).endOffset()) {
Expand Down
7 changes: 0 additions & 7 deletions s3stream/src/test/java/com/automq/stream/s3/wal/impl/object/ObjectWALServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,13 +295,6 @@ public static Stream<Arguments> testRecoverIteratorGetContinuousFromTrimOffsetDa
List.of(mockWALObject(0, 10), mockWALObject(10, 20), mockWALObject(30, 40)),
10L,
List.of(mockWALObject(10, 20))
),
Arguments.of(
"trimmed and hollow",
// When the object-10-20 doesn't write successfully and the broker halt, the hollow happens.
List.of(mockWALObject(0, 10), mockWALObject(30, 40)),
10L,
List.of()
)
);
}
Expand Down
Loading