Skip to content

KAFKA-12329; kafka-reassign-partitions command should give a better error message when a topic does not exist #10141

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 1, 2021
Merged

KAFKA-12329; kafka-reassign-partitions command should give a better error message when a topic does not exist #10141

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6a031a
KAFKA-12329; kafka-reassign-partitions command should give a better e…
dajac Mar 1, 2021
72defea
remove unused import
dajac Mar 1, 2021
e71bcc1
address comment
dajac Mar 1, 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
47 changes: 32 additions & 15 deletions core/src/main/scala/kafka/admin/ReassignPartitionsCommand.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,6 +812,26 @@ object ReassignPartitionsCommand extends Logging {
proposedAssignments
}

private def describeTopics(adminClient: Admin,
topics: Set[String])
: Map[String, TopicDescription] = {
adminClient.describeTopics(topics.asJava).values.asScala.map {
case (topicName, topicDescriptionFuture) =>
try {
topicName -> topicDescriptionFuture.get
}
catch {
case t: ExecutionException if t.getCause != null =>

@chia7712 chia7712 Mar 1, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

How about using classOf[UnknownTopicOrPartitionException].isInstance(t.getCause)? That includes null check.

if (t.getCause.isInstanceOf[UnknownTopicOrPartitionException]) {
throw new ExecutionException(
new UnknownTopicOrPartitionException(s"Topic $topicName not found."))
} else {
throw t
}
}
}
}

/**
* Get the current replica assignments for some topics.
*
Expand All @@ -823,12 +843,10 @@ object ReassignPartitionsCommand extends Logging {
def getReplicaAssignmentForTopics(adminClient: Admin,
topics: Seq[String])
: Map[TopicPartition, Seq[Int]] = {
adminClient.describeTopics(topics.asJava).all().get().asScala.flatMap {
case (topicName, topicDescription) =>
topicDescription.partitions.asScala.map {
info => (new TopicPartition(topicName, info.partition),
info.replicas.asScala.map(_.id))
}
describeTopics(adminClient, topics.toSet).flatMap {
case (topicName, topicDescription) => topicDescription.partitions.asScala.map { info =>
(new TopicPartition(topicName, info.partition), info.replicas.asScala.map(_.id))
}
}
}

Expand All @@ -843,15 +861,14 @@ object ReassignPartitionsCommand extends Logging {
def getReplicaAssignmentForPartitions(adminClient: Admin,
partitions: Set[TopicPartition])
: Map[TopicPartition, Seq[Int]] = {
adminClient.describeTopics(partitions.map(_.topic).asJava).all().get().asScala.flatMap {
case (topicName, topicDescription) =>
topicDescription.partitions.asScala.flatMap {
info => if (partitions.contains(new TopicPartition(topicName, info.partition))) {
Some(new TopicPartition(topicName, info.partition()),
info.replicas.asScala.map(_.id))
} else {
None
}
describeTopics(adminClient, partitions.map(_.topic)).flatMap {
case (topicName, topicDescription) => topicDescription.partitions.asScala.flatMap { info =>
val tp = new TopicPartition(topicName, info.partition)
if (partitions.contains(tp)) {
Some(tp, info.replicas.asScala.map(_.id))
} else {
None
}
}
}
}
Expand Down
14 changes: 14 additions & 0 deletions core/src/test/scala/unit/kafka/admin/ReassignPartitionsUnitTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,20 @@ class ReassignPartitionsUnitTest {
}
}

@Test
def testGenerateAssignmentWithInvalidPartitionsFails(): Unit = {
val adminClient = new MockAdminClient.Builder().numBrokers(5).build()
try {
addTopics(adminClient)
assertStartsWith("Topic quux not found",
assertThrows(classOf[ExecutionException],
() => generateAssignment(adminClient, """{"topics":[{"topic":"foo"},{"topic":"quux"}]}""", "0,1", false),
() => "Expected generateAssignment to fail").getCause.getMessage)
} finally {
adminClient.close()
}
}

@Test
def testGenerateAssignmentWithInconsistentRacks(): Unit = {
val adminClient = new MockAdminClient.Builder().
Expand Down