Skip to content
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

Commit refreshing: avoid extra work #867

Merged
merged 1 commit into from
Aug 20, 2019
Merged

Commit refreshing: avoid extra work #867

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
15 changes: 5 additions & 10 deletions core/src/main/scala/akka/kafka/internal/KafkaConsumerActor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@ import scala.util.control.NonFatal
final case class Revoked(partition: List[TopicPartition]) extends NoSerializationVerificationNeeded
final case class Messages[K, V](requestId: Int, messages: Iterator[ConsumerRecord[K, V]])
extends NoSerializationVerificationNeeded
final case class Committed(offsets: Map[TopicPartition, OffsetAndMetadata])
extends NoSerializationVerificationNeeded
final case class ConsumerMetrics(metrics: Map[MetricName, Metric]) extends NoSerializationVerificationNeeded {
def getMetrics: java.util.Map[MetricName, Metric] = metrics.asJava
}
Expand All @@ -92,7 +90,7 @@ import scala.util.control.NonFatal

private[KafkaConsumerActor] trait CommitRefreshing {
def add(offsets: Map[TopicPartition, OffsetAndMetadata]): Unit
def committed(offsets: Map[TopicPartition, OffsetAndMetadata]): Unit
def committed(offsets: java.util.Map[TopicPartition, OffsetAndMetadata]): Unit
def revoke(revokedTps: Set[TopicPartition]): Unit
def refreshOffsets: Map[TopicPartition, OffsetAndMetadata]
def updateRefreshDeadlines(tps: Set[TopicPartition]): Unit
Expand All @@ -111,7 +109,7 @@ import scala.util.control.NonFatal

private object NoOp extends CommitRefreshing {
def add(offsets: Map[TopicPartition, OffsetAndMetadata]): Unit = {}
def committed(offsets: Map[TopicPartition, OffsetAndMetadata]): Unit = {}
def committed(offsets: java.util.Map[TopicPartition, OffsetAndMetadata]): Unit = {}
def revoke(revokedTps: Set[TopicPartition]): Unit = {}
val refreshOffsets: Map[TopicPartition, OffsetAndMetadata] = Map.empty
def updateRefreshDeadlines(tps: Set[TopicPartition]): Unit = {}
Expand All @@ -131,8 +129,8 @@ import scala.util.control.NonFatal
def add(offsets: Map[TopicPartition, OffsetAndMetadata]): Unit =
requestedOffsets = requestedOffsets ++ offsets

def committed(offsets: Map[TopicPartition, OffsetAndMetadata]): Unit =
committedOffsets = committedOffsets ++ offsets
def committed(offsets: java.util.Map[TopicPartition, OffsetAndMetadata]): Unit =
committedOffsets = committedOffsets ++ offsets.asScala.toMap

def revoke(revokedTps: Set[TopicPartition]): Unit = {
requestedOffsets = requestedOffsets -- revokedTps
Expand Down Expand Up @@ -315,9 +313,6 @@ import scala.util.control.NonFatal
self ! delayedPollMsg
}

case Committed(offsets) =>
commitRefreshing.committed(offsets)

case Stop =>
commitAggregatedOffsets()
if (commitsInProgress == 0) {
Expand Down Expand Up @@ -505,7 +500,7 @@ import scala.util.control.NonFatal
commitsInProgress -= 1
if (exception != null) sendReply(Status.Failure(exception))
else {
self ! Committed(offsets.asScala.toMap)
commitRefreshing.committed(offsets)
sendReply(Done)
}
}
Expand Down