Skip to content

[SPARK-8833][STREAMING][WIP] Kafka Direct API support offset in zookeeper #7235

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
guowei2 wants to merge 2 commits into from
Closed

[SPARK-8833][STREAMING][WIP] Kafka Direct API support offset in zookeeper #7235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1941d7f
Kafka Direct API support offset in zookeeper
guowei2 Jul 6, 2015
e322623
Kafka Direct API support offset in zookeeper
guowei2 Jul 6, 2015
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
2 changes: 1 addition & 1 deletion external/kafka/src/main/scala/org/apache/spark/streaming/kafka/KafkaCluster.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ object KafkaCluster {
}

Seq("zookeeper.connect", "group.id").foreach { s =>
if (!props.contains(s)) {
if (!props.containsKey(s)) {
Copy link
Copy Markdown
Member

@srowen srowen Jul 6, 2015

Choose a reason for hiding this comment

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

That's a good bug fix

props.setProperty(s, "")
}
}
Expand Down
4 changes: 4 additions & 0 deletions external/kafka/src/main/scala/org/apache/spark/streaming/kafka/KafkaRDD.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,10 @@ class KafkaRDD[
.build()
val resp = consumer.fetch(req)
handleFetchErr(resp)

kc.setConsumerOffsets(kc.config.props.getString("group.id"),
Map(TopicAndPartition(part.topic, part.partition) ->
Math.min(kc.config.fetchMessageMaxBytes - part.fromOffset, part.untilOffset)))
// kafka may return a batch that starts before the requested offset
resp.messageSet(part.topic, part.partition)
.iterator
Expand Down
19 changes: 16 additions & 3 deletions external/kafka/src/main/scala/org/apache/spark/streaming/kafka/KafkaUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ import java.util.{Map => JMap}
import java.util.{Set => JSet}
import java.util.{List => JList}

import org.apache.spark.streaming.kafka.KafkaCluster.LeaderOffset

import scala.reflect.ClassTag
import scala.collection.JavaConversions._

Expand Down Expand Up @@ -403,12 +405,23 @@ object KafkaUtils {
topicPartitions <- kc.getPartitions(topics).right
leaderOffsets <- (if (reset == Some("smallest")) {
kc.getEarliestLeaderOffsets(topicPartitions)
} else {
} else if (reset == Some("largest")){
kc.getLatestLeaderOffsets(topicPartitions)
} else {
val groupId = kafkaParams.get("group.id") match {
case Some(g) => g
case _ => throw new SparkException("need group.id in kafkaParams")
}
val offsets =
kc.getConsumerOffsets(kafkaParams.getOrElse("group.id", ""), topicPartitions.seq)
if(offsets.isLeft) kc.getLatestLeaderOffsets(topicPartitions)
Copy link
Copy Markdown
Member

@srowen srowen Jul 6, 2015

Choose a reason for hiding this comment

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

This style is pretty wrong

else offsets
}).right
} yield {
val fromOffsets = leaderOffsets.map { case (tp, lo) =>
(tp, lo.offset)
val fromOffsets = leaderOffsets.map {
case (tp, LeaderOffset(_, _, lo)) => (tp, lo)
case (tp, lo: Long) => (tp, lo)
case _ => throw new SparkException ("get error leader offsets ")
Copy link
Copy Markdown
Member

@srowen srowen Jul 6, 2015

Choose a reason for hiding this comment

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

This is not a useful exception

}
new DirectKafkaInputDStream[K, V, KD, VD, (K, V)](
ssc, kafkaParams, fromOffsets, messageHandler)
Expand Down