Skip to content

fix: allow automq.zone.cidr.blocks to be set via static server.properties #3154

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
superhx merged 5 commits into from
Jan 26, 2026
+14 −2
Merged

fix: allow automq.zone.cidr.blocks to be set via static server.properties #3154

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
304f1b3
fix: allow automq.zone.cidr.blocks to be set via static server.proper…
manmohak07 Jan 15, 2026
f585b2c
Pass KafkaConfig to DefaultClientRackProvider for zone CIDR config
manmohak07 Jan 20, 2026
32c8ec2
remove: unused imports and make staticValue final
manmohak07 Jan 20, 2026
db3cc9b
remove: unused import and format other imports
manmohak07 Jan 22, 2026
64fe80e
add: DynamicBrokerConfig
manmohak07 Jan 22, 2026
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
19 changes: 16 additions & 3 deletions core/src/main/java/kafka/automq/zerozone/DefaultClientRackProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@
*/

package kafka.automq.zerozone;

import kafka.automq.interceptor.ClientIdMetadata;
import kafka.server.DynamicBrokerConfig;
import kafka.server.KafkaConfig;

import org.apache.kafka.common.Reconfigurable;
import org.apache.kafka.common.config.ConfigException;
Expand All @@ -39,13 +38,27 @@ public class DefaultClientRackProvider implements ClientRackProvider, Reconfigur
private static final Logger LOGGER = LoggerFactory.getLogger(DefaultClientRackProvider.class);
private static final String ZONE_CIDR_BLOCKS_CONFIG_KEY = "automq.zone.cidr.blocks";
private static final Set<String> RECONFIGURABLE_CONFIGS;

private final KafkaConfig kafkaConfig;
private CIDRMatcher cidrMatcher = new CIDRMatcher("");

static {
RECONFIGURABLE_CONFIGS = Set.of(
ZONE_CIDR_BLOCKS_CONFIG_KEY
);
RECONFIGURABLE_CONFIGS.forEach(DynamicBrokerConfig.AllDynamicConfigs()::add);
// Not adding to AllDynamicConfigs to allow static config via server.properties
// (required for Strimzi/K8s operators). We read static config in constructor instead.
// RECONFIGURABLE_CONFIGS.forEach(DynamicBrokerConfig.AllDynamicConfigs()::add);
}

public DefaultClientRackProvider(KafkaConfig kafkaConfig) {
this.kafkaConfig = kafkaConfig;
// Read static config from server.properties on initialization
final String staticValue = (String) kafkaConfig.originals().get(ZONE_CIDR_BLOCKS_CONFIG_KEY);
if (staticValue != null) {
this.cidrMatcher = new CIDRMatcher(staticValue);
LOGGER.info("Initialized with static zone CIDR blocks: {}", staticValue);
}
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/kafka/server/BrokerServer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ class BrokerServer(

var backPressureManager: BackPressureManager = _

val clientRackProvider = new DefaultClientRackProvider()
val clientRackProvider = new DefaultClientRackProvider(config)
// init reconfigurable before startup
config.addReconfigurable(clientRackProvider)

Expand Down
Loading