You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by jg...@apache.org on 2018/08/14 16:14:59 UTC
[kafka] branch trunk updated: MINOR: Clean up to avoid errors in
dynamic broker config tests (#5486)
This is an automated email from the ASF dual-hosted git repository.
jgus pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new cc8fc7c MINOR: Clean up to avoid errors in dynamic broker config tests (#5486)
cc8fc7c is described below
commit cc8fc7c449b97807fecaa179f5831f9bd31ce950
Author: Rajini Sivaram <ra...@googlemail.com>
AuthorDate: Tue Aug 14 17:14:48 2018 +0100
MINOR: Clean up to avoid errors in dynamic broker config tests (#5486)
Reviewers: Manikumar Reddy O <ma...@gmail.com>, Viktor Somogyi <vi...@gmail.com>, Jason Gustafson <ja...@confluent.io>
---
core/src/main/scala/kafka/server/DynamicBrokerConfig.scala | 12 ++++++++++++
core/src/main/scala/kafka/server/KafkaServer.scala | 3 +++
.../kafka/server/DynamicBrokerReconfigurationTest.scala | 2 +-
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/core/src/main/scala/kafka/server/DynamicBrokerConfig.scala b/core/src/main/scala/kafka/server/DynamicBrokerConfig.scala
index 19743e5..bcaaa02 100755
--- a/core/src/main/scala/kafka/server/DynamicBrokerConfig.scala
+++ b/core/src/main/scala/kafka/server/DynamicBrokerConfig.scala
@@ -190,6 +190,18 @@ class DynamicBrokerConfig(private val kafkaConfig: KafkaConfig) extends Logging
updateBrokerConfig(kafkaConfig.brokerId, brokerConfig)
}
+ /**
+ * Clear all cached values. This is used to clear state on broker shutdown to avoid
+ * exceptions in tests when broker is restarted. These fields are re-initialized when
+ * broker starts up.
+ */
+ private[server] def clear(): Unit = {
+ dynamicBrokerConfigs.clear()
+ dynamicDefaultConfigs.clear()
+ reconfigurables.clear()
+ brokerReconfigurables.clear()
+ }
+
def addReconfigurables(kafkaServer: KafkaServer): Unit = {
addBrokerReconfigurable(new DynamicThreadPool(kafkaServer))
if (kafkaServer.logManager.cleaner != null)
diff --git a/core/src/main/scala/kafka/server/KafkaServer.scala b/core/src/main/scala/kafka/server/KafkaServer.scala
index 6c1bb83..0ac877d 100755
--- a/core/src/main/scala/kafka/server/KafkaServer.scala
+++ b/core/src/main/scala/kafka/server/KafkaServer.scala
@@ -616,6 +616,9 @@ class KafkaServer(val config: KafkaConfig, time: Time = Time.SYSTEM, threadNameP
if (brokerTopicStats != null)
CoreUtils.swallow(brokerTopicStats.close(), this)
+ // Clear all reconfigurable instances stored in DynamicBrokerConfig
+ config.dynamicConfig.clear()
+
brokerState.newState(NotRunning)
startupComplete.set(false)
diff --git a/core/src/test/scala/integration/kafka/server/DynamicBrokerReconfigurationTest.scala b/core/src/test/scala/integration/kafka/server/DynamicBrokerReconfigurationTest.scala
index 5694cff..95a4665 100644
--- a/core/src/test/scala/integration/kafka/server/DynamicBrokerReconfigurationTest.scala
+++ b/core/src/test/scala/integration/kafka/server/DynamicBrokerReconfigurationTest.scala
@@ -131,10 +131,10 @@ class DynamicBrokerReconfigurationTest extends ZooKeeperTestHarness with SaslSet
servers += TestUtils.createServer(kafkaConfig)
}
+ TestUtils.createTopic(zkClient, topic, numPartitions, replicationFactor = numServers, servers)
TestUtils.createTopic(zkClient, Topic.GROUP_METADATA_TOPIC_NAME, OffsetConfig.DefaultOffsetsTopicNumPartitions,
replicationFactor = numServers, servers, servers.head.groupCoordinator.offsetsTopicConfigs)
- TestUtils.createTopic(zkClient, topic, numPartitions, replicationFactor = numServers, servers)
createAdminClient(SecurityProtocol.SSL, SecureInternal)
TestMetricsReporter.testReporters.clear()