Skip to content

KAFKA-19642: Replace dynamicPerBrokerConfigs with dynamicDefaultConfigs #20405

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
chia7712 merged 6 commits into from
Aug 27, 2025
Merged

KAFKA-19642: Replace dynamicPerBrokerConfigs with dynamicDefaultConfigs #20405

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
daeb1dd
Replace dynamicPerBrokerConfigs with dynamicDefaultConfigs
jim0987795064 Aug 24, 2025
3aab8c6
Use per-broker configs for broker-scoped updates correctly
jim0987795064 Aug 25, 2025
b15e1c0
feat: add test for readDynamicBrokerConfigsFromSnapshot
FrankYang0529 Aug 26, 2025
8696bdf
address comment
FrankYang0529 Aug 26, 2025
6cf7f20
address comment
FrankYang0529 Aug 26, 2025
8513d4e
address comment
FrankYang0529 Aug 27, 2025
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
7 changes: 3 additions & 4 deletions 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 @@ -219,7 +219,6 @@ object DynamicBrokerConfig {
logContext
)
) { reader =>
val dynamicPerBrokerConfigs = new Properties()
val dynamicDefaultConfigs = new Properties()
while (reader.hasNext) {
val batch = reader.next()
Expand All @@ -231,15 +230,15 @@ object DynamicBrokerConfig {
if (configRecord.resourceName().isEmpty) {
putOrRemoveIfNull(dynamicDefaultConfigs, configRecord.name(), configRecord.value())
} else if (configRecord.resourceName() == config.brokerId.toString) {
putOrRemoveIfNull(dynamicPerBrokerConfigs, configRecord.name(), configRecord.value())
putOrRemoveIfNull(dynamicDefaultConfigs, configRecord.name(), configRecord.value())

@junrao junrao Aug 25, 2025

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.

Hmm, this doesn't look right. If configRecord.resourceName() == config.brokerId.toString, it's a broker level config and it seems that we should use dynamicPerBrokerConfigs.

}
}
}
}
}
val configHandler = new BrokerConfigHandler(config, quotaManagers)
configHandler.processConfigChanges("", dynamicPerBrokerConfigs)
configHandler.processConfigChanges(config.brokerId.toString, dynamicPerBrokerConfigs)
configHandler.processConfigChanges("", dynamicDefaultConfigs)
configHandler.processConfigChanges(config.brokerId.toString, dynamicDefaultConfigs)

@junrao junrao Aug 25, 2025

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.

It seems that we should continue to use dynamicPerBrokerConfigs here?

@jim0987795064 jim0987795064 Aug 25, 2025 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@junrao
Thanks for pointing this out. I've corrected the misused dynamicDefaultConfigs and now use dynamicPerBrokerConfigs for broker-scoped updates.

}
}
}
Expand Down