Skip to content

KAFKA-6973: TopicCommand should verify topic-level config #5106

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
ijuma merged 2 commits into from
Jun 1, 2018
Merged

KAFKA-6973: TopicCommand should verify topic-level config #5106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1ee3bf
KAFKA-6973: TopicCommand should verify topic-level config `message.ti…
huxi-2b May 31, 2018
872ac96
addressed Ijuma's comments
huxi-2b Jun 1, 2018
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
2 changes: 1 addition & 1 deletion core/src/main/scala/kafka/log/LogConfig.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ object LogConfig {
KafkaConfig.LogPreAllocateProp)
.define(MessageFormatVersionProp, STRING, Defaults.MessageFormatVersion, MEDIUM, MessageFormatVersionDoc,
KafkaConfig.LogMessageFormatVersionProp)
.define(MessageTimestampTypeProp, STRING, Defaults.MessageTimestampType, MEDIUM, MessageTimestampTypeDoc,
.define(MessageTimestampTypeProp, STRING, Defaults.MessageTimestampType, in("CreateTime", "LogAppendTime"), MEDIUM, MessageTimestampTypeDoc,
KafkaConfig.LogMessageTimestampTypeProp)
.define(MessageTimestampDifferenceMaxMsProp, LONG, Defaults.MessageTimestampDifferenceMaxMs,
atLeast(0), MEDIUM, MessageTimestampDifferenceMaxMsDoc, KafkaConfig.LogMessageTimestampDifferenceMaxMsProp)
Expand Down
17 changes: 17 additions & 0 deletions core/src/test/scala/unit/kafka/admin/TopicCommandTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,4 +225,21 @@ class TopicCommandTest extends ZooKeeperTestHarness with Logging with RackAwareT
assertTrue(output.contains(topic) && output.contains(markedForDeletionList))
}

@Test
def testInvalidTopicLevelConfig(): Unit = {
val brokers = List(0)
TestUtils.createBrokersInZk(zkClient, brokers)

// create the topic
try {
val createOpts = new TopicCommandOptions(
Array("--partitions", "1", "--replication-factor", "1", "--topic", "test",
"--config", "message.timestamp.type=boom"))
TopicCommand.createTopic(zkClient, createOpts)
fail("Expected exception on invalid topic-level config.")
} catch {
case _: Exception => // topic creation should fail due to the invalid config
}
}

}