Skip to content

Commit 13e918e

Browse files
committed
fix(kafka-setup): skip schema registry config setup when kafka setup is disabled (#15268)
1 parent 9488594 commit 13e918e

File tree

2 files changed

+21
-2
lines changed

2 files changed

+21
-2
lines changed

datahub-upgrade/src/main/java/com/linkedin/datahub/upgrade/system/kafka/ConfluentSchemaRegistryCleanupPolicyStep.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,16 @@ public Function<UpgradeContext, UpgradeStepResult> executable() {
4747
return (context) -> {
4848
log.info("Configuring Confluent Schema Registry cleanup policies...");
4949

50-
// Check if Confluent Schema Registry is enabled
50+
// Check if Kafka setup is enabled
5151
if (_kafkaConfiguration.getSetup() == null
52-
|| !_kafkaConfiguration.getSetup().isUseConfluentSchemaRegistry()) {
52+
|| !_kafkaConfiguration.getSetup().isPreCreateTopics()) {
53+
log.info(
54+
"Skipping Confluent Schema Registry cleanup policy configuration - Kafka setup is disabled");
55+
return new DefaultUpgradeStepResult(this.id(), DataHubUpgradeState.SUCCEEDED);
56+
}
57+
58+
// Check if Confluent Schema Registry is enabled
59+
if (!_kafkaConfiguration.getSetup().isUseConfluentSchemaRegistry()) {
5360
log.info(
5461
"Skipping Confluent Schema Registry cleanup policy configuration - schema registry is disabled");
5562
return new DefaultUpgradeStepResult(this.id(), DataHubUpgradeState.SUCCEEDED);

datahub-upgrade/src/test/java/com/linkedin/datahub/upgrade/system/kafka/ConfluentSchemaRegistryCleanupPolicyStepTest.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,18 @@ public void testSkipWhenSetupConfigIsNull() {
8282
assertEquals(result.result(), DataHubUpgradeState.SUCCEEDED);
8383
}
8484

85+
@Test
86+
public void testSkipWhenPreCreateTopicsDisabled() {
87+
// Set preCreateTopics to false
88+
kafkaConfiguration.getSetup().setPreCreateTopics(false);
89+
90+
UpgradeContext mockContext = mock(UpgradeContext.class);
91+
UpgradeStepResult result = step.executable().apply(mockContext);
92+
93+
assertNotNull(result);
94+
assertEquals(result.result(), DataHubUpgradeState.SUCCEEDED);
95+
}
96+
8597
@Test
8698
public void testSuccessfulCleanupPolicyConfiguration() throws Exception {
8799
// Create spy to mock the createAdminClient method

0 commit comments

Comments
 (0)