Skip to content

[SPARK-57438][SS] Fix NullPointerException in Kafka source metrics when latest partition offsets are unavailable #56526

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

Open
yadavay-amzn wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −3
Open

[SPARK-57438][SS] Fix NullPointerException in Kafka source metrics when latest partition offsets are unavailable #56526

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
7 changes: 4 additions & 3 deletions ...r/kafka-0-10-sql/src/main/scala/org/apache/spark/sql/kafka010/KafkaMicroBatchStream.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ private[kafka010] class KafkaMicroBatchStream(
}
}
} else {
Some(latestPartitionOffsets)
Option(latestPartitionOffsets)

@Tom-Newton Tom-Newton Jun 15, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Is it possible to write a test to assert that this prevents the Some(null)?

}

KafkaMicroBatchStream.metrics(latestConsumedOffset, reCalculatedLatestPartitionOffsets)
Expand Down Expand Up @@ -513,10 +513,11 @@ object KafkaMicroBatchStream extends Logging {
latestConsumedOffset: Optional[Offset],
latestAvailablePartitionOffsets: Option[PartitionOffsetMap]): ju.Map[String, String] = {
val offset = Option(latestConsumedOffset.orElse(null))
val availableOffsets = latestAvailablePartitionOffsets.flatMap(Option(_))

if (offset.nonEmpty && latestAvailablePartitionOffsets.isDefined) {
if (offset.nonEmpty && availableOffsets.isDefined) {
val consumedPartitionOffsets = offset.map(KafkaSourceOffset(_)).get.partitionToOffsets
val offsetsBehindLatest = latestAvailablePartitionOffsets.get
val offsetsBehindLatest = availableOffsets.get
.map(partitionOffset => partitionOffset._2 -
consumedPartitionOffsets.getOrElse(partitionOffset._1, 0L))
if (offsetsBehindLatest.nonEmpty) {
Expand Down
8 changes: 8 additions & 0 deletions ...ka-0-10-sql/src/test/scala/org/apache/spark/sql/kafka010/KafkaMicroBatchSourceSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1883,6 +1883,14 @@ abstract class KafkaMicroBatchV2SourceSuite extends KafkaMicroBatchSourceSuiteBa
// test null latestAvailablePartitionOffsets
assert(KafkaMicroBatchStream.metrics(Optional.ofNullable(offset), None).isEmpty)
}

test("SPARK-57438: metrics should not NPE when latest partition offsets are unavailable" +
" (Some(null))") {
val topicPartition = new TopicPartition(newTopic(), 0)
val offset = KafkaSourceOffset(Map[TopicPartition, Long]((topicPartition, 1L)))
// Some(null) simulates latestPartitionOffsets being null before latestOffset() is called
assert(KafkaMicroBatchStream.metrics(Optional.of(offset), Some(null)).isEmpty)
}
}

class KafkaMicroBatchV1SourceWithAdminSuite extends KafkaMicroBatchV1SourceSuite {
Expand Down