From f85c7d46965630b0a85f5ef058ae066bdcd3b513 Mon Sep 17 00:00:00 2001 From: Calvin Liu <83986057+CalvinConfluent@users.noreply.github.com> Date: Wed, 19 Feb 2025 09:41:06 -0800 Subject: [PATCH] MINOR: Fix incorrect return value from upgradeFeatures #18958 Reviewers: Colin P. McCabe --- .../apache/kafka/controller/ConfigurationControlManager.java | 2 +- .../kafka/controller/ConfigurationControlManagerTest.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/metadata/src/main/java/org/apache/kafka/controller/ConfigurationControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ConfigurationControlManager.java index 89c6c5c9fe8..cb14b386d12 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ConfigurationControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ConfigurationControlManager.java @@ -677,7 +677,7 @@ public class ConfigurationControlManager { log.info("{}", logMessage); } records.addAll(result.records()); - return ControllerResult.atomicOf(records, null); + return ControllerResult.atomicOf(records, ApiError.NONE); } return result; } diff --git a/metadata/src/test/java/org/apache/kafka/controller/ConfigurationControlManagerTest.java b/metadata/src/test/java/org/apache/kafka/controller/ConfigurationControlManagerTest.java index fc8e1706458..39979cc8916 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/ConfigurationControlManagerTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/ConfigurationControlManagerTest.java @@ -64,7 +64,7 @@ import static org.apache.kafka.common.config.ConfigResource.Type.TOPIC; import static org.apache.kafka.common.metadata.MetadataRecordType.CONFIG_RECORD; import static org.apache.kafka.server.config.ConfigSynonym.HOURS_TO_MILLISECONDS; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; @Timeout(value = 40) @@ -472,7 +472,8 @@ public class ConfigurationControlManagerTest { Collections.singletonMap(EligibleLeaderReplicasVersion.FEATURE_NAME, FeatureUpdate.UpgradeType.UPGRADE), false); - assertNull(result.response()); + assertNotNull(result.response()); + assertEquals(Errors.NONE, result.response().error()); RecordTestUtils.replayAll(manager, result.records()); RecordTestUtils.replayAll(featureManager, result.records());