root
/
kafka
mirror of https://github.com/apache/kafka.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

KAFKA-18685: Cleanup DynamicLogConfig constructor (#18764) 

Reviewers: Chia-Ping Tsai <chia7712@gmail.com>, Christo Lolov <lolovc@amazon.com>
This commit is contained in:
Ken Huang 2025-02-03 23:38:05 +08:00 committed by GitHub
parent bc7b87001b
commit 7fdd11295c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/scala/kafka/server/DynamicBrokerConfig.scala
View File

@ -250,7 +250,7 @@ class DynamicBrokerConfig(private val kafkaConfig: KafkaConfig) extends Logging
addReconfigurable(new DynamicClientQuotaCallback(kafkaServer.quotaManagers, kafkaServer.config)) addReconfigurable(new DynamicClientQuotaCallback(kafkaServer.quotaManagers, kafkaServer.config))
addBrokerReconfigurable(new BrokerDynamicThreadPool(kafkaServer)) addBrokerReconfigurable(new BrokerDynamicThreadPool(kafkaServer))
addBrokerReconfigurable(new DynamicLogConfig(kafkaServer.logManager, kafkaServer)) addBrokerReconfigurable(new DynamicLogConfig(kafkaServer.logManager))
addBrokerReconfigurable(new DynamicListenerConfig(kafkaServer)) addBrokerReconfigurable(new DynamicListenerConfig(kafkaServer))
addBrokerReconfigurable(kafkaServer.socketServer) addBrokerReconfigurable(kafkaServer.socketServer)
addBrokerReconfigurable(new DynamicProducerStateManagerConfig(kafkaServer.logManager.producerStateManagerConfig)) addBrokerReconfigurable(new DynamicProducerStateManagerConfig(kafkaServer.logManager.producerStateManagerConfig))
@ -620,7 +620,7 @@ object DynamicLogConfig {
ServerTopicConfigSynonyms.TOPIC_CONFIG_SYNONYMS.asScala.values.toSet 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] = { override def reconfigurableConfigs: Set[String] = {
DynamicLogConfig.ReconfigurableConfigs DynamicLogConfig.ReconfigurableConfigs

8
core/src/test/scala/unit/kafka/server/DynamicBrokerConfigTest.scala
View File

@ -681,7 +681,7 @@ class DynamicBrokerConfigTest {
val props = TestUtils.createBrokerConfig(0, port = 8181) val props = TestUtils.createBrokerConfig(0, port = 8181)
props.put(ServerLogConfigs.LOG_RETENTION_TIME_MILLIS_CONFIG, "2592000000") props.put(ServerLogConfigs.LOG_RETENTION_TIME_MILLIS_CONFIG, "2592000000")
val config = KafkaConfig(props) 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.initialize(None)
config.dynamicConfig.addBrokerReconfigurable(dynamicLogConfig) config.dynamicConfig.addBrokerReconfigurable(dynamicLogConfig)
@ -704,7 +704,7 @@ class DynamicBrokerConfigTest {
val props = TestUtils.createBrokerConfig(0, port = 8181) val props = TestUtils.createBrokerConfig(0, port = 8181)
props.put(ServerLogConfigs.LOG_RETENTION_BYTES_CONFIG, "4294967296") props.put(ServerLogConfigs.LOG_RETENTION_BYTES_CONFIG, "4294967296")
val config = KafkaConfig(props) 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.initialize(None)
config.dynamicConfig.addBrokerReconfigurable(dynamicLogConfig) 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_TIME_MILLIS_CONFIG, retentionMs.toString)
props.put(ServerLogConfigs.LOG_RETENTION_BYTES_CONFIG, retentionBytes.toString) props.put(ServerLogConfigs.LOG_RETENTION_BYTES_CONFIG, retentionBytes.toString)
val config = KafkaConfig(props) 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.initialize(None)
config.dynamicConfig.addBrokerReconfigurable(dynamicLogConfig) config.dynamicConfig.addBrokerReconfigurable(dynamicLogConfig)
@ -992,7 +992,7 @@ class DynamicBrokerConfigTest {
.thenAnswer(invocation => currentDefaultLogConfig.set(invocation.getArgument(0))) .thenAnswer(invocation => currentDefaultLogConfig.set(invocation.getArgument(0)))
config.dynamicConfig.initialize(None) config.dynamicConfig.initialize(None)
config.dynamicConfig.addBrokerReconfigurable(new DynamicLogConfig(logManagerMock, serverMock)) config.dynamicConfig.addBrokerReconfigurable(new DynamicLogConfig(logManagerMock))
} }
@Test @Test