Skip to content

KAFKA-12398: Fix flaky test ConsumerBounceTest.testClose #10243

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
dajac merged 3 commits into from
Mar 13, 2021
Merged

KAFKA-12398: Fix flaky test ConsumerBounceTest.testClose #10243

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce4f482
KAFKA-12398: Fix flaky test
Mar 2, 2021
173a255
optimize
Mar 4, 2021
b977a82
fix
Mar 13, 2021
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
19 changes: 11 additions & 8 deletions core/src/test/scala/integration/kafka/api/ConsumerBounceTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class ConsumerBounceTest extends AbstractConsumerTest with Logging {

this.consumerConfig.setProperty(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG, "true")

override def generateConfigs = {
override def generateConfigs: Seq[KafkaConfig] = {
generateKafkaConfigs()
}

Expand Down Expand Up @@ -78,7 +78,7 @@ class ConsumerBounceTest extends AbstractConsumerTest with Logging {

@Test
@Disabled // To be re-enabled once we can make it less flaky (KAFKA-4801)
def testConsumptionWithBrokerFailures() = consumeWithBrokerFailures(10)
def testConsumptionWithBrokerFailures(): Unit = consumeWithBrokerFailures(10)

/*
* 1. Produce a bunch of messages
Expand Down Expand Up @@ -121,7 +121,7 @@ class ConsumerBounceTest extends AbstractConsumerTest with Logging {
}

@Test
def testSeekAndCommitWithBrokerFailures() = seekAndCommitWithBrokerFailures(5)
def testSeekAndCommitWithBrokerFailures(): Unit = seekAndCommitWithBrokerFailures(5)

def seekAndCommitWithBrokerFailures(numIters: Int): Unit = {
val numRecords = 1000
Expand Down Expand Up @@ -476,21 +476,24 @@ class ConsumerBounceTest extends AbstractConsumerTest with Logging {
// New instance of consumer should be assigned partitions immediately and should see committed offsets.
val assignSemaphore = new Semaphore(0)
val consumer = createConsumerWithGroupId(groupId)
consumer.subscribe(Collections.singletonList(topic), new ConsumerRebalanceListener {
consumer.subscribe(Collections.singletonList(topic), new ConsumerRebalanceListener {
def onPartitionsAssigned(partitions: Collection[TopicPartition]): Unit = {
assignSemaphore.release()
}
def onPartitionsRevoked(partitions: Collection[TopicPartition]): Unit = {
}})
consumer.poll(time.Duration.ofSeconds(3L))
assertTrue(assignSemaphore.tryAcquire(1, TimeUnit.SECONDS), "Assignment did not complete on time")

TestUtils.waitUntilTrue(() => {
consumer.poll(time.Duration.ofMillis(100L))
assignSemaphore.tryAcquire()
}, "Assignment did not complete on time")

if (committedRecords > 0)
assertEquals(committedRecords, consumer.committed(Set(tp).asJava).get(tp).offset)
consumer.close()
}

private class BounceBrokerScheduler(val numIters: Int) extends ShutdownableThread("daemon-bounce-broker", false)
{
private class BounceBrokerScheduler(val numIters: Int) extends ShutdownableThread("daemon-bounce-broker", false) {
var iter: Int = 0

override def doWork(): Unit = {
Expand Down