Skip to content

Fix potential NPE in BaseTaskGenerator.getNonConsumingSegmentsZKMetadataForRealtimeTable #18715

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

Closed
Akanksha-kedia wants to merge 2 commits into from
Closed

Fix potential NPE in BaseTaskGenerator.getNonConsumingSegmentsZKMetadataForRealtimeTable #18715

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01ac1a5
Fix potential NPE in BaseTaskGenerator.getNonConsumingSegmentsZKMetad…
Akanksha-kedia Jun 9, 2026
2787b0e
Fix null guard logic: skip segment when instanceStateMap is null
Akanksha-kedia Jun 9, 2026
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
7 changes: 6 additions & 1 deletion .../main/java/org/apache/pinot/controller/helix/core/minion/generator/BaseTaskGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,13 +180,18 @@ public List<SegmentZKMetadata> getNonConsumingSegmentsZKMetadataForRealtimeTable
List<SegmentZKMetadata> selectedSegmentZKMetadataList = new ArrayList<>();
for (SegmentZKMetadata segmentZKMetadata : segmentZKMetadataList) {
String segmentName = segmentZKMetadata.getSegmentName();
Map<String, String> instanceStateMap = idealState.getInstanceStateMap(segmentName);
if (idealStateSegments.contains(segmentName)
&& segmentZKMetadata.getStatus().isCompleted() // skip consuming segments
&& !idealState.getInstanceStateMap(segmentName).containsValue(SegmentStateModel.CONSUMING)) {
&& instanceStateMap != null

@Jackie-Jiang Jackie-Jiang Jun 21, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We don't need this null check since we already checked idealStateSegments.contains(segmentName). No need to handle corrupted ideal state

&& !instanceStateMap.containsValue(SegmentStateModel.CONSUMING)) {
// The last check is for an edge case where
// 1. SegmentZKMetadata was updated to DONE in segment commit protocol, but
// 2. IdealState for the segment was not updated to ONLINE due to some issue in the controller.
// We avoid picking up such segments to allow RealtimeSegmentValidationManager to fix them.
// Note: instanceStateMap == null also means the segment is in a broken state (partition exists in
// IdealState but has no instance assignments). We skip it as well to let RealtimeSegmentValidationManager
// repair it first.
selectedSegmentZKMetadataList.add(segmentZKMetadata);
}
}
Expand Down