Skip to content

KAFKA-20117: Improve ClusterControlManager error message #21731

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 1 commit into from
Mar 18, 2026
+19 −7
Merged

KAFKA-20117: Improve ClusterControlManager error message #21731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 15 additions & 3 deletions metadata/src/main/java/org/apache/kafka/controller/ClusterControlManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,10 +525,22 @@ BrokerFeature processRegistrationFeature(
int defaultVersion = feature.name().equals(MetadataVersion.FEATURE_NAME) ? 1 : 0; // The default value for MetadataVersion is 1 not 0.
short finalized = finalizedFeatures.versionOrDefault(feature.name(), (short) defaultVersion);
if (!VersionRange.of(feature.minSupportedVersion(), feature.maxSupportedVersion()).contains(finalized)) {
boolean isMetadataVersion = feature.name().equals(MetadataVersion.FEATURE_NAME);
String finalizedDisplay = isMetadataVersion
? finalized + " (" + MetadataVersion.fromFeatureLevel(finalized) + ")"
: String.valueOf(finalized);
String minSupportedDisplay = isMetadataVersion
? feature.minSupportedVersion() + " (" +
MetadataVersion.fromFeatureLevel(feature.minSupportedVersion()) + ")"
: String.valueOf(feature.minSupportedVersion());
String maxSupportedDisplay = isMetadataVersion
? feature.maxSupportedVersion() + " (" +
MetadataVersion.fromFeatureLevel(feature.maxSupportedVersion()) + ")"
: String.valueOf(feature.maxSupportedVersion());
throw new UnsupportedVersionException("Unable to register because the broker " +
"does not support finalized version " + finalized + " of " + feature.name() +
". The broker wants a version between " + feature.minSupportedVersion() + " and " +
feature.maxSupportedVersion() + ", inclusive.");
"does not support finalized version " + finalizedDisplay + " of " + feature.name() +
". The broker wants a version between " + minSupportedDisplay + " and " +
maxSupportedDisplay + ", inclusive.");
}
// A feature is not found in the finalizedFeature map if it is unknown to the controller or set to 0 (feature not enabled).
if (!finalizedFeatures.featureNames().contains(feature.name()))
Expand Down
8 changes: 4 additions & 4 deletions metadata/src/test/java/org/apache/kafka/controller/ClusterControlManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,8 +686,8 @@ public void testRegistrationWithUnsupportedMetadataVersion() {
build();
clusterControl.activate();

assertEquals("Unable to register because the broker does not support finalized version 4 of " +
"metadata.version. The broker wants a version between 1 and 1, inclusive.",
assertEquals("Unable to register because the broker does not support finalized version 4 (3.3-IV0) of " +
"metadata.version. The broker wants a version between 1 (3.0-IV1) and 1 (3.0-IV1), inclusive.",
assertThrows(UnsupportedVersionException.class,
() -> clusterControl.registerBroker(
new BrokerRegistrationRequestData().
Expand All @@ -698,8 +698,8 @@ public void testRegistrationWithUnsupportedMetadataVersion() {
123L,
featureControl.finalizedFeatures(Long.MAX_VALUE))).getMessage());

assertEquals("Unable to register because the broker does not support finalized version 4 of " +
"metadata.version. The broker wants a version between 7 and 7, inclusive.",
assertEquals("Unable to register because the broker does not support finalized version 4 (3.3-IV0) of " +
"metadata.version. The broker wants a version between 7 (3.3-IV3) and 7 (3.3-IV3), inclusive.",
assertThrows(UnsupportedVersionException.class,
() -> clusterControl.registerBroker(
new BrokerRegistrationRequestData().
Expand Down