chia7712 commented on code in PR #20674:
URL: https://github.com/apache/kafka/pull/20674#discussion_r2569455406
##########
clients/src/main/java/org/apache/kafka/clients/admin/DescribeFeaturesOptions.java:
##########
@@ -16,8 +16,27 @@
*/
package org.apache.kafka.clients.admin;
+import java.util.OptionalInt;
+
/**
* Options for {@link AdminClient#describeFeatures(DescribeFeaturesOptions)}.
*/
public class DescribeFeaturesOptions extends
AbstractOptions<DescribeFeaturesOptions> {
+ private OptionalInt nodeId = OptionalInt.empty();
Review Comment:
Would you mind adding this new feature to `upgrade.html`?
##########
clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/DescribeFeaturesTest.java:
##########
@@ -0,0 +1,151 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.kafka.clients.admin;
+
+import org.apache.kafka.common.test.ClusterInstance;
+import org.apache.kafka.common.test.api.ClusterConfigProperty;
+import org.apache.kafka.common.test.api.ClusterTest;
+import org.apache.kafka.common.test.api.Type;
+import org.apache.kafka.server.common.EligibleLeaderReplicasVersion;
+import org.apache.kafka.server.common.Feature;
+import org.apache.kafka.server.common.GroupVersion;
+import org.apache.kafka.server.common.KRaftVersion;
+import org.apache.kafka.server.common.MetadataVersion;
+import org.apache.kafka.server.common.ShareVersion;
+import org.apache.kafka.server.common.StreamsVersion;
+import org.apache.kafka.server.common.TransactionVersion;
+
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class DescribeFeaturesTest {
+
+ @ClusterTest(
+ types = {Type.KRAFT},
+ metadataVersion = MetadataVersion.IBP_3_7_IV0,
+ controllers = 2,
+ serverProperties = {
+ @ClusterConfigProperty(
+ id = 3000,
+ key = "unstable.api.versions.enable",
+ value = "true"
+ ),
+ @ClusterConfigProperty(
+ id = 3001,
+ key = "unstable.api.versions.enable",
+ value = "false"
+ )
+ }
+ )
+ public void testUnstableApiVersionsOnController(ClusterInstance
clusterInstance) {
+ try (Admin admin = clusterInstance.admin(Map.of(), true)) {
+ // unstable.api.versions.enable is true on node 3000
+ FeatureMetadata featureMetadata = assertDoesNotThrow(
+ () -> admin.describeFeatures(new
DescribeFeaturesOptions().nodeId(3000)).featureMetadata().get());
+ assertEquals(Map.of(
+ GroupVersion.FEATURE_NAME, new
SupportedVersionRange(Feature.GROUP_VERSION.minimumProduction(),
Feature.GROUP_VERSION.latestTesting()),
+ KRaftVersion.FEATURE_NAME, new
SupportedVersionRange(Feature.KRAFT_VERSION.minimumProduction(),
Feature.KRAFT_VERSION.latestTesting()),
+ MetadataVersion.FEATURE_NAME, new
SupportedVersionRange(MetadataVersion.MINIMUM_VERSION.featureLevel(),
MetadataVersion.latestTesting().featureLevel()),
+ ShareVersion.FEATURE_NAME, new
SupportedVersionRange(Feature.SHARE_VERSION.minimumProduction(),
Feature.SHARE_VERSION.latestTesting()),
+ StreamsVersion.FEATURE_NAME, new
SupportedVersionRange(Feature.STREAMS_VERSION.minimumProduction(),
Feature.STREAMS_VERSION.latestTesting()),
+ TransactionVersion.FEATURE_NAME, new
SupportedVersionRange(Feature.TRANSACTION_VERSION.minimumProduction(),
Feature.TRANSACTION_VERSION.latestTesting()),
+ EligibleLeaderReplicasVersion.FEATURE_NAME, new
SupportedVersionRange(Feature.ELIGIBLE_LEADER_REPLICAS_VERSION.minimumProduction(),
Feature.ELIGIBLE_LEADER_REPLICAS_VERSION.latestTesting())
+ ), featureMetadata.supportedFeatures());
+
+ // unstable.api.versions.enable is false on node 3001
+ featureMetadata = assertDoesNotThrow(
+ () -> admin.describeFeatures(new
DescribeFeaturesOptions().nodeId(3001)).featureMetadata().get());
+ assertEquals(Map.of(
+ GroupVersion.FEATURE_NAME, new
SupportedVersionRange(Feature.GROUP_VERSION.minimumProduction(),
Feature.GROUP_VERSION.latestProduction()),
+ KRaftVersion.FEATURE_NAME, new
SupportedVersionRange(Feature.KRAFT_VERSION.minimumProduction(),
Feature.KRAFT_VERSION.latestProduction()),
+ MetadataVersion.FEATURE_NAME, new
SupportedVersionRange(MetadataVersion.MINIMUM_VERSION.featureLevel(),
MetadataVersion.latestProduction().featureLevel()),
+ ShareVersion.FEATURE_NAME, new
SupportedVersionRange(Feature.SHARE_VERSION.minimumProduction(),
Feature.SHARE_VERSION.latestProduction()),
+ StreamsVersion.FEATURE_NAME, new
SupportedVersionRange(Feature.STREAMS_VERSION.minimumProduction(),
Feature.STREAMS_VERSION.latestProduction()),
+ TransactionVersion.FEATURE_NAME, new
SupportedVersionRange(Feature.TRANSACTION_VERSION.minimumProduction(),
Feature.TRANSACTION_VERSION.latestProduction()),
+ EligibleLeaderReplicasVersion.FEATURE_NAME, new
SupportedVersionRange(Feature.ELIGIBLE_LEADER_REPLICAS_VERSION.minimumProduction(),
Feature.ELIGIBLE_LEADER_REPLICAS_VERSION.latestProduction())
+ ), featureMetadata.supportedFeatures());
+ }
+ }
+
+ @ClusterTest(
+ types = {Type.KRAFT},
+ metadataVersion = MetadataVersion.IBP_3_7_IV0,
+ brokers = 2,
+ serverProperties = {
+ @ClusterConfigProperty(
+ id = 0,
+ key = "unstable.feature.versions.enable",
+ value = "true"
+ ),
+ @ClusterConfigProperty(
+ id = 1,
+ key = "unstable.feature.versions.enable",
+ value = "false"
+ )
+ }
+ )
+ public void testUnstableFeatureVersionsOnBroker(ClusterInstance
clusterInstance) {
Review Comment:
Could you refactor the code to eliminate the similar logic?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
