Skip to content

KAFKA-9254: Overridden topic configs are reset after dynamic default change #7870

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
hachikuji merged 3 commits into from
Jan 24, 2020
Merged

KAFKA-9254: Overridden topic configs are reset after dynamic default change #7870

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
c9cf095
KAFKA-9254: Topic level configuration failed
huxi-2b Dec 25, 2019
49f992c
addressed rajinisivaram's comments
huxi-2b Jan 10, 2020
fbc6e22
Reverse assertEquals arguments to ensure failure messages appear corr…
rajinisivaram Jan 24, 2020
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/server/DynamicBrokerConfig.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,7 @@ class DynamicLogConfig(logManager: LogManager, server: KafkaServer) extends Brok
props ++= newBrokerDefaults
props ++= log.config.originals.asScala.filterKeys(log.config.overriddenConfigs.contains)

val logConfig = LogConfig(props.asJava)
val logConfig = LogConfig(props.asJava, log.config.overriddenConfigs)
log.updateConfig(logConfig)
}
}
Expand Down
36 changes: 35 additions & 1 deletion core/src/test/scala/integration/kafka/server/DynamicBrokerReconfigurationTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,40 @@ class DynamicBrokerReconfigurationTest extends ZooKeeperTestHarness with SaslSet
stopAndVerifyProduceConsume(producerThread, consumerThread)
}

@Test
def testConsecutiveConfigChange(): Unit = {
val topic2 = "testtopic2"
val topicProps = new Properties
topicProps.put(KafkaConfig.MinInSyncReplicasProp, "2")
TestUtils.createTopic(zkClient, topic2, 1, replicationFactor = numServers, servers, topicProps)
var log = servers.head.logManager.getLog(new TopicPartition(topic2, 0)).getOrElse(throw new IllegalStateException("Log not found"))
assertTrue(log.config.overriddenConfigs.contains(KafkaConfig.MinInSyncReplicasProp))
assertEquals(log.config.originals().get(KafkaConfig.MinInSyncReplicasProp).toString, "2")

@rajinisivaram rajinisivaram Jan 21, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

assertEquals uses expected as the first arg and actual as the second. Can you reverse the args here and in the other usages below to ensure that any error messages appear correctly if the test fails?

@rajinisivaram rajinisivaram Jan 24, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@huxihx I have pushed a commit with this minor change.


val props = new Properties
props.put(KafkaConfig.MinInSyncReplicasProp, "3")
// Make a broker-default config
reconfigureServers(props, perBrokerConfig = false, (KafkaConfig.MinInSyncReplicasProp, "3"))
// Verify that all broker defaults have been updated again
servers.foreach { server =>
props.asScala.foreach { case (k, v) =>
assertEquals(s"Not reconfigured $k", server.config.originals.get(k).toString, v)
}
}

log = servers.head.logManager.getLog(new TopicPartition(topic2, 0)).getOrElse(throw new IllegalStateException("Log not found"))
assertTrue(log.config.overriddenConfigs.contains(KafkaConfig.MinInSyncReplicasProp))
assertEquals(log.config.originals().get(KafkaConfig.MinInSyncReplicasProp).toString, "2") // Verify topic-level config survives

// Make a second broker-default change
props.clear()
props.put(KafkaConfig.LogRetentionTimeMillisProp, "604800000")
reconfigureServers(props, perBrokerConfig = false, (KafkaConfig.LogRetentionTimeMillisProp, "604800000"))
log = servers.head.logManager.getLog(new TopicPartition(topic2, 0)).getOrElse(throw new IllegalStateException("Log not found"))
assertTrue(log.config.overriddenConfigs.contains(KafkaConfig.MinInSyncReplicasProp))
assertEquals(log.config.originals().get(KafkaConfig.MinInSyncReplicasProp).toString, "2") // Verify topic-level config still survives
}

@Test
def testDefaultTopicConfig(): Unit = {
val (producerThread, consumerThread) = startProduceConsume(retries = 0)
Expand Down Expand Up @@ -774,7 +808,7 @@ class DynamicBrokerReconfigurationTest extends ZooKeeperTestHarness with SaslSet
val partitions = (0 until numPartitions).map(i => new TopicPartition(topic, i)).filter { tp =>
zkClient.getLeaderForPartition(tp).contains(leaderId)
}
assertTrue(s"Partitons not found with leader $leaderId", partitions.nonEmpty)
assertTrue(s"Partitions not found with leader $leaderId", partitions.nonEmpty)
partitions.foreach { tp =>
(1 to 2).foreach { i =>
val replicaFetcherManager = servers(i).replicaManager.replicaFetcherManager
Expand Down