Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -844,6 +844,11 @@ public KafkaBrokerConfigurationBuilder withUserConfiguration(KafkaConfiguration
? new KafkaConfiguration(userConfig)
: new KafkaConfiguration(reconciliation, new ArrayList<>());

// Set default min.insync.replicas=1 if not specified by the user
if (userConfig.getConfigOption("min.insync.replicas") == null) {
userConfig.setConfigOption("min.insync.replicas", "1");
}

printConfigProviders(userConfig);

printMetricReporters(userConfig, injectCcMetricsReporter, injectKafkaJmxReporter, injectStrimziMetricsReporter);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,8 @@ public void testNullUserConfiguration() {
"config.providers.strimzifile.class=org.apache.kafka.common.config.provider.FileConfigProvider",
"config.providers.strimzifile.param.allowed.paths=/opt/kafka",
"config.providers.strimzidir.class=org.apache.kafka.common.config.provider.DirectoryConfigProvider",
"config.providers.strimzidir.param.allowed.paths=/opt/kafka"));
"config.providers.strimzidir.param.allowed.paths=/opt/kafka",
"min.insync.replicas=1"));
}

@Test
Expand All @@ -516,7 +517,8 @@ public void testNullUserConfigurationAndCCReporter() {
"config.providers.strimzifile.param.allowed.paths=/opt/kafka",
"config.providers.strimzidir.class=org.apache.kafka.common.config.provider.DirectoryConfigProvider",
"config.providers.strimzidir.param.allowed.paths=/opt/kafka",
"metric.reporters=com.linkedin.kafka.cruisecontrol.metricsreporter.CruiseControlMetricsReporter"));
"metric.reporters=com.linkedin.kafka.cruisecontrol.metricsreporter.CruiseControlMetricsReporter",
"min.insync.replicas=1"));
}

@Test
Expand All @@ -535,7 +537,8 @@ public void testEmptyUserConfiguration() {
"config.providers.strimzifile.class=org.apache.kafka.common.config.provider.FileConfigProvider",
"config.providers.strimzifile.param.allowed.paths=/opt/kafka",
"config.providers.strimzidir.class=org.apache.kafka.common.config.provider.DirectoryConfigProvider",
"config.providers.strimzidir.param.allowed.paths=/opt/kafka"));
"config.providers.strimzidir.param.allowed.paths=/opt/kafka",
"min.insync.replicas=1"));
}

@Test
Expand Down Expand Up @@ -563,7 +566,8 @@ public void testUserConfiguration() {
"auto.create.topics.enable=false",
"offsets.topic.replication.factor=3",
"transaction.state.log.replication.factor=3",
"transaction.state.log.min.isr=2"));
"transaction.state.log.min.isr=2",
"min.insync.replicas=1"));
}

@Test
Expand All @@ -587,7 +591,8 @@ public void testUserConfigurationWithConfigProviders() {
"config.providers.strimzifile.param.allowed.paths=/opt/kafka",
"config.providers.strimzidir.class=org.apache.kafka.common.config.provider.DirectoryConfigProvider",
"config.providers.strimzidir.param.allowed.paths=/opt/kafka",
"config.providers.env.class=org.apache.kafka.common.config.provider.EnvVarConfigProvider"));
"config.providers.env.class=org.apache.kafka.common.config.provider.EnvVarConfigProvider",
"min.insync.replicas=1"));

// Controller
configuration = new KafkaBrokerConfigurationBuilder(Reconciliation.DUMMY_RECONCILIATION, new NodeRef("my-cluster-kafka-3", 3, "kafka", true, false))
Expand All @@ -598,7 +603,8 @@ public void testUserConfigurationWithConfigProviders() {
"config.providers=env,strimzienv",
"config.providers.strimzienv.class=org.apache.kafka.common.config.provider.EnvVarConfigProvider",
"config.providers.strimzienv.param.allowlist.pattern=.*",
"config.providers.env.class=org.apache.kafka.common.config.provider.EnvVarConfigProvider"));
"config.providers.env.class=org.apache.kafka.common.config.provider.EnvVarConfigProvider",
"min.insync.replicas=1"));
}

@Test
Expand Down Expand Up @@ -631,7 +637,8 @@ public void testNullUserConfigurationWithJmxMetricsReporter() {
"config.providers.strimzifile.param.allowed.paths=/opt/kafka",
"config.providers.strimzidir.class=org.apache.kafka.common.config.provider.DirectoryConfigProvider",
"config.providers.strimzidir.param.allowed.paths=/opt/kafka",
"metric.reporters=org.apache.kafka.common.metrics.JmxReporter"));
"metric.reporters=org.apache.kafka.common.metrics.JmxReporter",
"min.insync.replicas=1"));
}

@Test
Expand All @@ -647,6 +654,7 @@ public void testNullUserConfigurationWithStrimziMetricsReporter() {
"config.providers.strimzifile.param.allowed.paths=/opt/kafka",
"config.providers.strimzidir.class=org.apache.kafka.common.config.provider.DirectoryConfigProvider",
"config.providers.strimzidir.param.allowed.paths=/opt/kafka",
"min.insync.replicas=1",
"metric.reporters=" + StrimziMetricsReporterConfig.KAFKA_CLASS,
"kafka.metrics.reporters=" + StrimziMetricsReporterConfig.YAMMER_CLASS));
}
Expand All @@ -666,6 +674,7 @@ public void testNullUserConfigurationWithCruiseControlAndStrimziMetricsReporters
"config.providers.strimzifile.param.allowed.paths=/opt/kafka",
"config.providers.strimzidir.class=org.apache.kafka.common.config.provider.DirectoryConfigProvider",
"config.providers.strimzidir.param.allowed.paths=/opt/kafka",
"min.insync.replicas=1",
"metric.reporters=" + CruiseControlMetricsReporter.CRUISE_CONTROL_METRIC_REPORTER
+ "," + StrimziMetricsReporterConfig.KAFKA_CLASS,
"kafka.metrics.reporters=" + StrimziMetricsReporterConfig.YAMMER_CLASS));
Expand All @@ -688,7 +697,8 @@ public void testNullUserConfigurationWithCruiseControlAndJmxAndStrimziMetricsRep
"metric.reporters=" + CruiseControlMetricsReporter.CRUISE_CONTROL_METRIC_REPORTER
+ ",org.apache.kafka.common.metrics.JmxReporter"
+ "," + StrimziMetricsReporterConfig.KAFKA_CLASS,
"kafka.metrics.reporters=" + StrimziMetricsReporterConfig.YAMMER_CLASS));
"kafka.metrics.reporters=" + StrimziMetricsReporterConfig.YAMMER_CLASS,
"min.insync.replicas=1"));
}

static Stream<Arguments> sourceUserConfigWithMetricsReporters() {
Expand All @@ -704,7 +714,8 @@ static Stream<Arguments> sourceUserConfigWithMetricsReporters() {
+ "config.providers.strimzifile.class=org.apache.kafka.common.config.provider.FileConfigProvider\n"
+ "config.providers.strimzifile.param.allowed.paths=/opt/kafka\n"
+ "config.providers.strimzidir.class=org.apache.kafka.common.config.provider.DirectoryConfigProvider\n"
+ "config.providers.strimzidir.param.allowed.paths=/opt/kafka\n";
+ "config.providers.strimzidir.param.allowed.paths=/opt/kafka\n"
+ "min.insync.replicas=1\n";

// testing 8 combinations of 3 boolean values
return Stream.of(
Expand Down Expand Up @@ -778,7 +789,8 @@ public void testStrimziMetricsReporterViaUserAndMetricsConfigs() {
"config.providers.strimzidir.class=org.apache.kafka.common.config.provider.DirectoryConfigProvider",
"config.providers.strimzidir.param.allowed.paths=/opt/kafka",
"metric.reporters=" + StrimziMetricsReporterConfig.KAFKA_CLASS,
"kafka.metrics.reporters=" + StrimziMetricsReporterConfig.YAMMER_CLASS));
"kafka.metrics.reporters=" + StrimziMetricsReporterConfig.YAMMER_CLASS,
"min.insync.replicas=1"));
}

@Test
Expand Down Expand Up @@ -2617,4 +2629,29 @@ public void testWithKRaftMetadataLogDir() {
"metadata.log.dir=/my/kraft/metadata/kafka-log2"
));
}

@Test
public void testDefaultMinInSyncReplicasWhenNotSpecified() {
Map<String, Object> userConfiguration = new HashMap<>();
userConfiguration.put("auto.create.topics.enable", "false");
userConfiguration.put("offsets.topic.replication.factor", 3);

KafkaConfiguration kafkaConfiguration = new KafkaConfiguration(Reconciliation.DUMMY_RECONCILIATION, userConfiguration.entrySet());

String configuration = new KafkaBrokerConfigurationBuilder(Reconciliation.DUMMY_RECONCILIATION, NODE_REF)
.withUserConfiguration(kafkaConfiguration, false, false, false)
.build();

assertThat(configuration, isEquivalent("node.id=2",
"config.providers=strimzienv,strimzifile,strimzidir",
"config.providers.strimzienv.class=org.apache.kafka.common.config.provider.EnvVarConfigProvider",
"config.providers.strimzienv.param.allowlist.pattern=.*",
"config.providers.strimzifile.class=org.apache.kafka.common.config.provider.FileConfigProvider",
"config.providers.strimzifile.param.allowed.paths=/opt/kafka",
"config.providers.strimzidir.class=org.apache.kafka.common.config.provider.DirectoryConfigProvider",
"config.providers.strimzidir.param.allowed.paths=/opt/kafka",
"min.insync.replicas=1",
"auto.create.topics.enable=false",
"offsets.topic.replication.factor=3"));
}
}
Loading