From 7fdd11295c0d2ed130cf0339396e972f1c958796 Mon Sep 17 00:00:00 2001 From: Ken Huang Date: Mon, 3 Feb 2025 23:38:05 +0800 Subject: [PATCH] KAFKA-18685: Cleanup DynamicLogConfig constructor (#18764) Reviewers: Chia-Ping Tsai , Christo Lolov --- .../src/main/scala/kafka/server/DynamicBrokerConfig.scala | 4 ++-- .../scala/unit/kafka/server/DynamicBrokerConfigTest.scala | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/main/scala/kafka/server/DynamicBrokerConfig.scala b/core/src/main/scala/kafka/server/DynamicBrokerConfig.scala index d210ca06f93fd..5f60a07bcd2af 100755 --- a/core/src/main/scala/kafka/server/DynamicBrokerConfig.scala +++ b/core/src/main/scala/kafka/server/DynamicBrokerConfig.scala @@ -250,7 +250,7 @@ class DynamicBrokerConfig(private val kafkaConfig: KafkaConfig) extends Logging addReconfigurable(new DynamicClientQuotaCallback(kafkaServer.quotaManagers, kafkaServer.config)) addBrokerReconfigurable(new BrokerDynamicThreadPool(kafkaServer)) - addBrokerReconfigurable(new DynamicLogConfig(kafkaServer.logManager, kafkaServer)) + addBrokerReconfigurable(new DynamicLogConfig(kafkaServer.logManager)) addBrokerReconfigurable(new DynamicListenerConfig(kafkaServer)) addBrokerReconfigurable(kafkaServer.socketServer) addBrokerReconfigurable(new DynamicProducerStateManagerConfig(kafkaServer.logManager.producerStateManagerConfig)) @@ -620,7 +620,7 @@ object DynamicLogConfig { ServerTopicConfigSynonyms.TOPIC_CONFIG_SYNONYMS.asScala.values.toSet } -class DynamicLogConfig(logManager: LogManager, server: KafkaBroker) extends BrokerReconfigurable with Logging { +class DynamicLogConfig(logManager: LogManager) extends BrokerReconfigurable with Logging { override def reconfigurableConfigs: Set[String] = { DynamicLogConfig.ReconfigurableConfigs diff --git a/core/src/test/scala/unit/kafka/server/DynamicBrokerConfigTest.scala b/core/src/test/scala/unit/kafka/server/DynamicBrokerConfigTest.scala index 61aacbf0f1adb..e8702eacfa318 100755 --- a/core/src/test/scala/unit/kafka/server/DynamicBrokerConfigTest.scala +++ b/core/src/test/scala/unit/kafka/server/DynamicBrokerConfigTest.scala @@ -681,7 +681,7 @@ class DynamicBrokerConfigTest { val props = TestUtils.createBrokerConfig(0, port = 8181) props.put(ServerLogConfigs.LOG_RETENTION_TIME_MILLIS_CONFIG, "2592000000") val config = KafkaConfig(props) - val dynamicLogConfig = new DynamicLogConfig(mock(classOf[LogManager]), mock(classOf[KafkaBroker])) + val dynamicLogConfig = new DynamicLogConfig(mock(classOf[LogManager])) config.dynamicConfig.initialize(None) config.dynamicConfig.addBrokerReconfigurable(dynamicLogConfig) @@ -704,7 +704,7 @@ class DynamicBrokerConfigTest { val props = TestUtils.createBrokerConfig(0, port = 8181) props.put(ServerLogConfigs.LOG_RETENTION_BYTES_CONFIG, "4294967296") val config = KafkaConfig(props) - val dynamicLogConfig = new DynamicLogConfig(mock(classOf[LogManager]), mock(classOf[KafkaBroker])) + val dynamicLogConfig = new DynamicLogConfig(mock(classOf[LogManager])) config.dynamicConfig.initialize(None) config.dynamicConfig.addBrokerReconfigurable(dynamicLogConfig) @@ -964,7 +964,7 @@ class DynamicBrokerConfigTest { props.put(ServerLogConfigs.LOG_RETENTION_TIME_MILLIS_CONFIG, retentionMs.toString) props.put(ServerLogConfigs.LOG_RETENTION_BYTES_CONFIG, retentionBytes.toString) val config = KafkaConfig(props) - val dynamicLogConfig = new DynamicLogConfig(mock(classOf[LogManager]), mock(classOf[KafkaBroker])) + val dynamicLogConfig = new DynamicLogConfig(mock(classOf[LogManager])) config.dynamicConfig.initialize(None) config.dynamicConfig.addBrokerReconfigurable(dynamicLogConfig) @@ -992,7 +992,7 @@ class DynamicBrokerConfigTest { .thenAnswer(invocation => currentDefaultLogConfig.set(invocation.getArgument(0))) config.dynamicConfig.initialize(None) - config.dynamicConfig.addBrokerReconfigurable(new DynamicLogConfig(logManagerMock, serverMock)) + config.dynamicConfig.addBrokerReconfigurable(new DynamicLogConfig(logManagerMock)) } @Test