Skip to content

Fix log level and throw NPE on null currOffset in SeekableStreamIndexTaskRunner #7253

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
gianm merged 1 commit into from
Mar 13, 2019
Merged

Fix log level and throw NPE on null currOffset in SeekableStreamIndexTaskRunner #7253

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
35 changes: 19 additions & 16 deletions ...src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1887,30 +1887,33 @@ private boolean verifyInitialRecordAndSkipExclusivePartition(
{
// Check only for the first record among the record batch.
if (initialOffsetsSnapshot.contains(record.getPartitionId())) {
final SequenceOffsetType currOffset = currOffsets.get(record.getPartitionId());
if (currOffset != null) {
final OrderedSequenceNumber<SequenceOffsetType> recordSequenceNumber = createSequenceNumber(
record.getSequenceNumber()
);
final OrderedSequenceNumber<SequenceOffsetType> currentSequenceNumber = createSequenceNumber(
currOffset
final SequenceOffsetType currOffset = Preconditions.checkNotNull(
currOffsets.get(record.getPartitionId()),
"Current offset is null for sequenceNumber[%s] and partitionId[%s]",
record.getSequenceNumber(),
record.getPartitionId()
);
final OrderedSequenceNumber<SequenceOffsetType> recordSequenceNumber = createSequenceNumber(
record.getSequenceNumber()
);
final OrderedSequenceNumber<SequenceOffsetType> currentSequenceNumber = createSequenceNumber(
currOffset
);
if (recordSequenceNumber.compareTo(currentSequenceNumber) < 0) {
throw new ISE(
"sequenceNumber of the start record[%s] is smaller than current sequenceNumber[%s] for partition[%s]",
record.getSequenceNumber(),
currOffset,
record.getPartitionId()
);
if (recordSequenceNumber.compareTo(currentSequenceNumber) < 0) {
throw new ISE(
"sequenceNumber of the start record[%s] is smaller than current sequenceNumber[%s] for partition [%s]",
record.getSequenceNumber(),
currOffset,
record.getPartitionId()
);
}
}

// Remove the mark to notify that this partition has been read.
initialOffsetsSnapshot.remove(record.getPartitionId());

// check exclusive starting sequence
if (isStartingSequenceOffsetsExclusive() && exclusiveStartingPartitions.contains(record.getPartitionId())) {
log.warn("Skipping starting sequenceNumber for partition [%s] marked exclusive", record.getPartitionId());
log.info("Skipping starting sequenceNumber for partition[%s] marked exclusive", record.getPartitionId());

return false;
}
Expand Down