junrao commented on code in PR #22989:
URL: https://github.com/apache/kafka/pull/22989#discussion_r3858670135
##########
clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java:
##########
@@ -366,57 +360,47 @@ public void testSerialization() {
}
@Test
- public void testClientThrottlesResponsesWithThrottleTime() {
- Map<ApiKeys, Short> postKip219Version = Map.ofEntries(
- Map.entry(ApiKeys.PRODUCE, (short) 6),
- Map.entry(ApiKeys.FETCH, (short) 8),
- Map.entry(ApiKeys.LIST_OFFSETS, (short) 3),
- Map.entry(ApiKeys.METADATA, (short) 6),
- Map.entry(ApiKeys.OFFSET_COMMIT, (short) 4),
- Map.entry(ApiKeys.OFFSET_FETCH, (short) 4),
- Map.entry(ApiKeys.FIND_COORDINATOR, (short) 2),
- Map.entry(ApiKeys.JOIN_GROUP, (short) 3),
- Map.entry(ApiKeys.HEARTBEAT, (short) 2),
- Map.entry(ApiKeys.LEAVE_GROUP, (short) 2),
- Map.entry(ApiKeys.SYNC_GROUP, (short) 2),
- Map.entry(ApiKeys.DESCRIBE_GROUPS, (short) 2),
- Map.entry(ApiKeys.LIST_GROUPS, (short) 2),
- Map.entry(ApiKeys.API_VERSIONS, (short) 2),
- Map.entry(ApiKeys.CREATE_TOPICS, (short) 3),
- Map.entry(ApiKeys.DELETE_TOPICS, (short) 2),
- Map.entry(ApiKeys.DELETE_RECORDS, (short) 1),
- Map.entry(ApiKeys.INIT_PRODUCER_ID, (short) 1),
- Map.entry(ApiKeys.ADD_PARTITIONS_TO_TXN, (short) 1),
- Map.entry(ApiKeys.ADD_OFFSETS_TO_TXN, (short) 1),
- Map.entry(ApiKeys.END_TXN, (short) 1),
- Map.entry(ApiKeys.TXN_OFFSET_COMMIT, (short) 1),
- Map.entry(ApiKeys.DESCRIBE_ACLS, (short) 1),
- Map.entry(ApiKeys.CREATE_ACLS, (short) 1),
- Map.entry(ApiKeys.DELETE_ACLS, (short) 1),
- Map.entry(ApiKeys.DESCRIBE_CONFIGS, (short) 2),
- Map.entry(ApiKeys.ALTER_CONFIGS, (short) 1),
- Map.entry(ApiKeys.ALTER_REPLICA_LOG_DIRS, (short) 1),
- Map.entry(ApiKeys.DESCRIBE_LOG_DIRS, (short) 1),
- Map.entry(ApiKeys.CREATE_PARTITIONS, (short) 1),
- Map.entry(ApiKeys.CREATE_DELEGATION_TOKEN, (short) 1),
- Map.entry(ApiKeys.RENEW_DELEGATION_TOKEN, (short) 1),
- Map.entry(ApiKeys.EXPIRE_DELEGATION_TOKEN, (short) 1),
- Map.entry(ApiKeys.DESCRIBE_DELEGATION_TOKEN, (short) 1),
- Map.entry(ApiKeys.DELETE_GROUPS, (short) 1)
- );
+ public void testKip219BoundariesHaveThrottleTimeField() {
+ Kip219ClientThrottleVersion.BOUNDARIES.forEach((apiKey,
boundaryVersion) -> {
+ assertTrue(getResponse(apiKey,
boundaryVersion).shouldClientThrottle(boundaryVersion),
+ apiKey + " should client throttle at KIP-219 boundary " +
boundaryVersion);
+
assertNotNull(apiKey.messageType.responseSchemas()[boundaryVersion].get("throttle_time_ms"),
+ apiKey + " KIP-219 boundary " + boundaryVersion +
+ " precedes the version that added throttle_time_ms");
+ });
+ }
- for (ApiKeys apiKey : ApiKeys.values()) {
+ @Test
+ public void testKip219BoundariesAreStillNeeded() {
+ List<ApiKeys> obsoleteApiKeys = new ArrayList<>();
+ Kip219ClientThrottleVersion.BOUNDARIES.forEach((apiKey,
boundaryVersion) -> {
+ boolean stillNeeded = false;
for (short version : apiKey.allVersions()) {
- boolean responseHasThrottleTime =
-
apiKey.messageType.responseSchemas()[version].get("throttle_time_ms") != null;
- short firstPostKip219Version =
postKip219Version.getOrDefault(apiKey, apiKey.oldestVersion());
- boolean shouldClientThrottle = responseHasThrottleTime &&
- version >= firstPostKip219Version;
- assertEquals(shouldClientThrottle, getResponse(apiKey,
version).shouldClientThrottle(version),
- "Unexpected shouldClientThrottle result for " + apiKey + "
version " + version +
- ": responseHasThrottleTime=" + responseHasThrottleTime
+
- ", firstPostKip219Version=" + firstPostKip219Version);
+ if (version < boundaryVersion &&
+
apiKey.messageType.responseSchemas()[version].get("throttle_time_ms") != null) {
Review Comment:
This seems more complicated than necessary. We can just assert that
apiKey.messageType.lowestSupportedVersion < boundaryVersion.
##########
clients/src/main/java/org/apache/kafka/common/requests/Kip219ClientThrottleVersion.java:
##########
@@ -0,0 +1,57 @@
+/*
+ * 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.common.requests;
+
+import org.apache.kafka.common.protocol.ApiKeys;
+
+import java.util.Map;
+
+final class Kip219ClientThrottleVersion {
+
+ // Each value is the first version of the corresponding API after KIP-219
was introduced. An entry should be
+ // removed once no supported version below the boundary contains
throttle_time_ms.
Review Comment:
We can just say remove the entry when there are no supported versions below
the boundary.
--
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]
