Skip to content

KAFKA-19280: Fix NoSuchElementException in UnifiedLog #19717

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
lucasbru merged 3 commits into from
May 17, 2025
Merged

KAFKA-19280: Fix NoSuchElementException in UnifiedLog #19717

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4da2925
fix
lucasbru May 14, 2025
c443bdd
other fixes
lucasbru May 15, 2025
66d15fb
commnets
lucasbru May 16, 2025
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
34 changes: 19 additions & 15 deletions storage/src/main/java/org/apache/kafka/storage/internals/log/UnifiedLog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ private void initializeTopicId() {

if (partMetadataFile.exists()) {
Uuid fileTopicId = partMetadataFile.read().topicId();
if (topicId.isPresent() && !topicId.get().equals(fileTopicId)) {
if (topicId.filter(x -> !x.equals(fileTopicId)).isPresent()) {
throw new InconsistentTopicIdException("Tried to assign topic ID " + topicId + " to log for topic partition " + topicPartition() + "," +
"but log already contained topic ID " + fileTopicId);
}
Expand Down Expand Up @@ -645,10 +645,12 @@ public Optional<Long> firstUnstableOffset() {
private LogOffsetMetadata fetchLastStableOffsetMetadata() throws IOException {
localLog.checkIfMemoryMappedBufferClosed();

// cache the current high watermark to avoid a concurrent update invalidating the range check
// cache the current high watermark and the first unstable offset metadata to avoid a concurrent update
// invalidating the range check breaking the isPresent check
LogOffsetMetadata highWatermarkMetadata = fetchHighWatermarkMetadata();
if (firstUnstableOffsetMetadata.isPresent() && firstUnstableOffsetMetadata.get().messageOffset < highWatermarkMetadata.messageOffset) {
LogOffsetMetadata lom = firstUnstableOffsetMetadata.get();
Optional<LogOffsetMetadata> firstUnstableOffsetMetadataCopy = firstUnstableOffsetMetadata;

@mimaison mimaison May 16, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we add a comment or update the comment just above?

@lucasbru lucasbru May 16, 2025

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

if (firstUnstableOffsetMetadataCopy.isPresent() && firstUnstableOffsetMetadataCopy.get().messageOffset < highWatermarkMetadata.messageOffset) {
LogOffsetMetadata lom = firstUnstableOffsetMetadataCopy.get();
if (lom.messageOffsetOnly()) {
synchronized (lock) {
LogOffsetMetadata fullOffset = maybeConvertToOffsetMetadata(lom.messageOffset);
Expand All @@ -671,8 +673,10 @@ private LogOffsetMetadata fetchLastStableOffsetMetadata() throws IOException {
* beyond the high watermark.
*/
public long lastStableOffset() {
if (firstUnstableOffsetMetadata.isPresent() && firstUnstableOffsetMetadata.get().messageOffset < highWatermark()) {
return firstUnstableOffsetMetadata.get().messageOffset;
// cache the first unstable offset metadata to avoid a concurrent update breaking the isPresent check
Optional<LogOffsetMetadata> firstUnstableOffsetMetadataCopy = firstUnstableOffsetMetadata;

@mimaison mimaison May 16, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe worth adding a comment. There are a few places in this class where we say we cache a value to avoid concurrency issues.

@lucasbru lucasbru May 16, 2025

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

if (firstUnstableOffsetMetadataCopy.isPresent() && firstUnstableOffsetMetadataCopy.get().messageOffset < highWatermark()) {
return firstUnstableOffsetMetadataCopy.get().messageOffset;
} else {
return highWatermark();
}
Expand Down Expand Up @@ -750,15 +754,15 @@ public void assignTopicId(Uuid topicId) {
}
} else {
this.topicId = Optional.of(topicId);
if (partitionMetadataFile.isPresent()) {
PartitionMetadataFile file = partitionMetadataFile.get();
if (!file.exists()) {
file.record(topicId);
scheduler().scheduleOnce("flush-metadata-file", this::maybeFlushMetadataFile);
}
} else {
logger.warn("The topic id {} will not be persisted to the partition metadata file since the partition is deleted", topicId);
}
partitionMetadataFile.ifPresentOrElse(
file -> {
if (!file.exists()) {
file.record(topicId);
scheduler().scheduleOnce("flush-metadata-file", this::maybeFlushMetadataFile);
}
},
() -> logger.warn("The topic id {} will not be persisted to the partition metadata file since the partition is deleted", topicId)
);
}
}

Expand Down