Skip to content

MINOR: Reduce ResetConsumerGroupOffsetTest flakiness #5830

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
stanislavkozlovski wants to merge 1 commit into from
Closed

MINOR: Reduce ResetConsumerGroupOffsetTest flakiness #5830

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
1 change: 1 addition & 0 deletions core/src/main/scala/kafka/admin/ConsumerGroupCommand.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import kafka.utils._
import org.apache.kafka.clients.{CommonClientConfigs, admin}
import org.apache.kafka.clients.admin._
import org.apache.kafka.clients.consumer.{ConsumerConfig, KafkaConsumer, OffsetAndMetadata}
import org.apache.kafka.common.errors.CoordinatorNotAvailableException
import org.apache.kafka.common.serialization.StringDeserializer
import org.apache.kafka.common.utils.Utils
import org.apache.kafka.common.{KafkaException, Node, TopicPartition}
Expand Down
20 changes: 18 additions & 2 deletions core/src/test/scala/unit/kafka/admin/ResetConsumerGroupOffsetTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@ import joptsimple.OptionException
import kafka.admin.ConsumerGroupCommand.ConsumerGroupService
import kafka.server.KafkaConfig
import kafka.utils.TestUtils
import org.apache.kafka.clients.consumer.OffsetAndMetadata
import org.apache.kafka.clients.producer.ProducerRecord
import org.apache.kafka.common.TopicPartition
import org.apache.kafka.common.errors.CoordinatorNotAvailableException
import org.junit.Assert._
import org.junit.Test

Expand Down Expand Up @@ -86,7 +88,7 @@ class ResetConsumerGroupOffsetTest extends ConsumerGroupCommandTest {
val args = Array("--bootstrap-server", brokerList, "--reset-offsets", "--group", "missing.group", "--all-topics",
"--to-current", "--execute")
val consumerGroupCommand = getConsumerGroupService(args)
val resetOffsets = consumerGroupCommand.resetOffsets()
val resetOffsets = tryResetOffsets(consumerGroupCommand)
assertEquals(Map.empty, resetOffsets)
assertEquals(resetOffsets, committedOffsets(group = "missing.group"))
}
Expand Down Expand Up @@ -389,7 +391,21 @@ class ResetConsumerGroupOffsetTest extends ConsumerGroupCommandTest {
}

private def resetOffsets(consumerGroupService: ConsumerGroupService): Map[TopicPartition, Long] = {
consumerGroupService.resetOffsets().mapValues(_.offset)
tryResetOffsets(consumerGroupService).mapValues(_.offset)
}

private def tryResetOffsets(consumerGroupService: ConsumerGroupService): Map[TopicPartition, OffsetAndMetadata] = {
var retries = 0
var gotResult = false

while (retries < 3) {
try {
return consumerGroupService.resetOffsets()
} catch {
case _: CoordinatorNotAvailableException => retries += 1
}
}

fail(s"Could not reset offsets. $retries retries resulted in ${classOf[CoordinatorNotAvailableException].getName}")
}
}