Skip to content

KAFKA-13591; Fix flaky test ControllerIntegrationTest.testTopicIdCreatedOnUpgrade #11666

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 2 commits into from
Jan 21, 2022
Merged

KAFKA-13591; Fix flaky test ControllerIntegrationTest.testTopicIdCreatedOnUpgrade #11666

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aacbc6b
KAFKA-13591; Fix flaky test ControllerIntegrationTest.testTopicIdCrea…
dajac Jan 11, 2022
a1c1043
Address comment
dajac Jan 13, 2022
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
21 changes: 10 additions & 11 deletions core/src/test/scala/unit/kafka/controller/ControllerIntegrationTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1127,27 +1127,26 @@ class ControllerIntegrationTest extends QuorumTestHarness {
TestUtils.createTopic(zkClient, tp.topic, partitionReplicaAssignment = assignment, servers = servers)
waitForPartitionState(tp, firstControllerEpoch, controllerId, LeaderAndIsr.initialLeaderEpoch,
"failed to get expected partition state upon topic creation")
val topicIdAfterCreate = zkClient.getTopicIdsForTopics(Set(tp.topic())).get(tp.topic())
assertEquals(None, topicIdAfterCreate)
val emptyTopicId = controller.controllerContext.topicIds.get("t")
assertEquals(None, emptyTopicId)
assertEquals(None, zkClient.getTopicIdsForTopics(Set(tp.topic)).get(tp.topic))
assertEquals(None, controller.controllerContext.topicIds.get(tp.topic))

servers(controllerId).shutdown()
servers(controllerId).awaitShutdown()
servers = makeServers(1)
TestUtils.waitUntilTrue(() => zkClient.getControllerId.isDefined, "failed to elect a controller")
val topicIdAfterUpgrade = zkClient.getTopicIdsForTopics(Set(tp.topic())).get(tp.topic())
assertNotEquals(emptyTopicId, topicIdAfterUpgrade)

val (topicIdAfterUpgrade, _) = TestUtils.computeUntilTrue(zkClient.getTopicIdsForTopics(Set(tp.topic)).get(tp.topic))(_.nonEmpty)
assertNotEquals(None, topicIdAfterUpgrade, s"topic id for ${tp.topic} not found in ZK")

val controller2 = getController().kafkaController
assertNotEquals(emptyTopicId, controller2.controllerContext.topicIds.get("t"))
val topicId = controller2.controllerContext.topicIds.get("t").get
assertEquals(topicIdAfterUpgrade.get, topicId)
assertEquals("t", controller2.controllerContext.topicNames(topicId))
val topicId = controller2.controllerContext.topicIds.get(tp.topic)
assertEquals(topicIdAfterUpgrade, topicId)
assertEquals(tp.topic, controller2.controllerContext.topicNames(topicId.get))

TestUtils.waitUntilTrue(() => servers(0).logManager.getLog(tp).isDefined, "log was not created")

val topicIdInLog = servers(0).logManager.getLog(tp).get.topicId
assertEquals(Some(topicId), topicIdInLog)
assertEquals(topicId, topicIdInLog)

adminZkClient.deleteTopic(tp.topic)
TestUtils.waitUntilTrue(() => !servers.head.kafkaController.controllerContext.allTopics.contains(tp.topic),
Expand Down