Skip to content

Commit

Permalink
KAFKA-18685: Cleanup DynamicLogConfig constructor (#18764)
Browse files Browse the repository at this point in the history
Reviewers: Chia-Ping Tsai <[email protected]>, Christo Lolov <[email protected]>
  • Loading branch information
m1a2st authored Feb 3, 2025
1 parent bc7b870 commit 7fdd112
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions core/src/main/scala/kafka/server/DynamicBrokerConfig.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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)

Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 7fdd112

Please sign in to comment.