Skip to content

KAFKA-14215; Ensure forwarded requests are applied to broker request quota #12624

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
hachikuji merged 3 commits into from
Sep 13, 2022
Merged

KAFKA-14215; Ensure forwarded requests are applied to broker request quota #12624

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
917e577
KAFKA-14215; Ensure forwarded requests are applied to broker request …
hachikuji Sep 12, 2022
7856625
Assert correct throttle time set in response
hachikuji Sep 12, 2022
05ced21
Change setThrottleTimeMs to maybeSetThrottleTimeMs
hachikuji Sep 12, 2022
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
2 changes: 2 additions & 0 deletions clients/src/main/java/org/apache/kafka/common/requests/AbstractResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,8 @@ public ApiKeys apiKey() {

public abstract int throttleTimeMs();

public abstract void setThrottleTimeMs(int throttleTimeMs);

@mumrah mumrah Sep 12, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about maybeSetThrottleTimeMs since not all response schemas support it.

@hachikuji hachikuji Sep 12, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense. Will change.


public String toString() {
return data().toString();
}
Expand Down
5 changes: 5 additions & 0 deletions clients/src/main/java/org/apache/kafka/common/requests/AddOffsetsToTxnResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ public int throttleTimeMs() {
return data.throttleTimeMs();
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
data.setThrottleTimeMs(throttleTimeMs);
}

@Override
public AddOffsetsToTxnResponseData data() {
return data;
Expand Down
5 changes: 5 additions & 0 deletions clients/src/main/java/org/apache/kafka/common/requests/AddPartitionsToTxnResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,11 @@ public int throttleTimeMs() {
return data.throttleTimeMs();
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
data.setThrottleTimeMs(throttleTimeMs);
}

public Map<TopicPartition, Errors> errors() {
if (cachedErrorsMap != null) {
return cachedErrorsMap;
Expand Down
5 changes: 5 additions & 0 deletions clients/src/main/java/org/apache/kafka/common/requests/AllocateProducerIdsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ public int throttleTimeMs() {
return data.throttleTimeMs();
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
data.setThrottleTimeMs(throttleTimeMs);
}

public Errors error() {
return Errors.forCode(data.errorCode());
}
Expand Down
5 changes: 5 additions & 0 deletions clients/src/main/java/org/apache/kafka/common/requests/AlterClientQuotasResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@ public int throttleTimeMs() {
return data.throttleTimeMs();
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
data.setThrottleTimeMs(throttleTimeMs);
}

@Override
public Map<Errors, Integer> errorCounts() {
Map<Errors, Integer> counts = new HashMap<>();
Expand Down
5 changes: 5 additions & 0 deletions clients/src/main/java/org/apache/kafka/common/requests/AlterConfigsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ public int throttleTimeMs() {
return data.throttleTimeMs();
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
data.setThrottleTimeMs(throttleTimeMs);
}

@Override
public AlterConfigsResponseData data() {
return data;
Expand Down
5 changes: 5 additions & 0 deletions ...s/src/main/java/org/apache/kafka/common/requests/AlterPartitionReassignmentsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ public int throttleTimeMs() {
return data.throttleTimeMs();
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
data.setThrottleTimeMs(throttleTimeMs);
}

@Override
public Map<Errors, Integer> errorCounts() {
Map<Errors, Integer> counts = new HashMap<>();
Expand Down
5 changes: 5 additions & 0 deletions clients/src/main/java/org/apache/kafka/common/requests/AlterPartitionResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ public int throttleTimeMs() {
return data.throttleTimeMs();
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
data.setThrottleTimeMs(throttleTimeMs);
}

public static AlterPartitionResponse parse(ByteBuffer buffer, short version) {
return new AlterPartitionResponse(new AlterPartitionResponseData(new ByteBufferAccessor(buffer), version));
}
Expand Down
5 changes: 5 additions & 0 deletions clients/src/main/java/org/apache/kafka/common/requests/AlterReplicaLogDirsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ public int throttleTimeMs() {
return data.throttleTimeMs();
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
data.setThrottleTimeMs(throttleTimeMs);
}

@Override
public Map<Errors, Integer> errorCounts() {
Map<Errors, Integer> errorCounts = new HashMap<>();
Expand Down
5 changes: 5 additions & 0 deletions ...nts/src/main/java/org/apache/kafka/common/requests/AlterUserScramCredentialsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ public int throttleTimeMs() {
return data.throttleTimeMs();
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
data.setThrottleTimeMs(throttleTimeMs);
}

@Override
public Map<Errors, Integer> errorCounts() {
return errorCounts(data.results().stream().map(r -> Errors.forCode(r.errorCode())));
Expand Down
5 changes: 5 additions & 0 deletions clients/src/main/java/org/apache/kafka/common/requests/ApiVersionsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,11 @@ public int throttleTimeMs() {
return this.data.throttleTimeMs();
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
data.setThrottleTimeMs(throttleTimeMs);
}

@Override
public boolean shouldClientThrottle(short version) {
return version >= 2;
Expand Down
5 changes: 5 additions & 0 deletions clients/src/main/java/org/apache/kafka/common/requests/BeginQuorumEpochResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,11 @@ public int throttleTimeMs() {
return DEFAULT_THROTTLE_TIME;
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
// Not supported by the response schema
}

public static BeginQuorumEpochResponse parse(ByteBuffer buffer, short version) {
return new BeginQuorumEpochResponse(new BeginQuorumEpochResponseData(new ByteBufferAccessor(buffer), version));
}
Expand Down
5 changes: 5 additions & 0 deletions clients/src/main/java/org/apache/kafka/common/requests/BrokerHeartbeatResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ public int throttleTimeMs() {
return data.throttleTimeMs();
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
data.setThrottleTimeMs(throttleTimeMs);
}

@Override
public Map<Errors, Integer> errorCounts() {
Map<Errors, Integer> errorCounts = new HashMap<>();
Expand Down
5 changes: 5 additions & 0 deletions clients/src/main/java/org/apache/kafka/common/requests/BrokerRegistrationResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ public int throttleTimeMs() {
return data.throttleTimeMs();
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
data.setThrottleTimeMs(throttleTimeMs);
}

@Override
public Map<Errors, Integer> errorCounts() {
Map<Errors, Integer> errorCounts = new HashMap<>();
Expand Down
5 changes: 5 additions & 0 deletions clients/src/main/java/org/apache/kafka/common/requests/ControlledShutdownResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ public int throttleTimeMs() {
return DEFAULT_THROTTLE_TIME;
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
// Not supported by the response schema
}

public static ControlledShutdownResponse parse(ByteBuffer buffer, short version) {
return new ControlledShutdownResponse(new ControlledShutdownResponseData(new ByteBufferAccessor(buffer), version));
}
Expand Down
5 changes: 5 additions & 0 deletions clients/src/main/java/org/apache/kafka/common/requests/CreateAclsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ public int throttleTimeMs() {
return data.throttleTimeMs();
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
data.setThrottleTimeMs(throttleTimeMs);
}

public List<CreateAclsResponseData.AclCreationResult> results() {
return data.results();
}
Expand Down
5 changes: 5 additions & 0 deletions clients/src/main/java/org/apache/kafka/common/requests/CreateDelegationTokenResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,11 @@ public int throttleTimeMs() {
return data.throttleTimeMs();
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
data.setThrottleTimeMs(throttleTimeMs);
}

public Errors error() {
return Errors.forCode(data.errorCode());
}
Expand Down
5 changes: 5 additions & 0 deletions clients/src/main/java/org/apache/kafka/common/requests/CreatePartitionsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,9 @@ public boolean shouldClientThrottle(short version) {
public int throttleTimeMs() {
return data.throttleTimeMs();
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
data.setThrottleTimeMs(throttleTimeMs);
}
}
5 changes: 5 additions & 0 deletions clients/src/main/java/org/apache/kafka/common/requests/CreateTopicsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ public int throttleTimeMs() {
return data.throttleTimeMs();
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
data.setThrottleTimeMs(throttleTimeMs);
}

@Override
public Map<Errors, Integer> errorCounts() {
HashMap<Errors, Integer> counts = new HashMap<>();
Expand Down
5 changes: 5 additions & 0 deletions clients/src/main/java/org/apache/kafka/common/requests/DeleteAclsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ public int throttleTimeMs() {
return data.throttleTimeMs();
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
data.setThrottleTimeMs(throttleTimeMs);
}

public List<DeleteAclsResponseData.DeleteAclsFilterResult> filterResults() {
return data.filterResults();
}
Expand Down
5 changes: 5 additions & 0 deletions clients/src/main/java/org/apache/kafka/common/requests/DeleteGroupsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@ public int throttleTimeMs() {
return data.throttleTimeMs();
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
data.setThrottleTimeMs(throttleTimeMs);
}

@Override
public boolean shouldClientThrottle(short version) {
return version >= 1;
Expand Down
5 changes: 5 additions & 0 deletions clients/src/main/java/org/apache/kafka/common/requests/DeleteRecordsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ public int throttleTimeMs() {
return data.throttleTimeMs();
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
data.setThrottleTimeMs(throttleTimeMs);
}

@Override
public Map<Errors, Integer> errorCounts() {
Map<Errors, Integer> errorCounts = new HashMap<>();
Expand Down
5 changes: 5 additions & 0 deletions clients/src/main/java/org/apache/kafka/common/requests/DeleteTopicsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ public int throttleTimeMs() {
return data.throttleTimeMs();
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
data.setThrottleTimeMs(throttleTimeMs);
}

@Override
public DeleteTopicsResponseData data() {
return data;
Expand Down
5 changes: 5 additions & 0 deletions clients/src/main/java/org/apache/kafka/common/requests/DescribeAclsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,11 @@ public int throttleTimeMs() {
return data.throttleTimeMs();
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
data.setThrottleTimeMs(throttleTimeMs);
}

public ApiError error() {
return new ApiError(Errors.forCode(data.errorCode()), data.errorMessage());
}
Expand Down
5 changes: 5 additions & 0 deletions clients/src/main/java/org/apache/kafka/common/requests/DescribeClientQuotasResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@ public int throttleTimeMs() {
return data.throttleTimeMs();
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
data.setThrottleTimeMs(throttleTimeMs);
}

@Override
public DescribeClientQuotasResponseData data() {
return data;
Expand Down
5 changes: 5 additions & 0 deletions clients/src/main/java/org/apache/kafka/common/requests/DescribeClusterResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ public int throttleTimeMs() {
return data.throttleTimeMs();
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
data.setThrottleTimeMs(throttleTimeMs);
}

@Override
public DescribeClusterResponseData data() {
return data;
Expand Down
5 changes: 5 additions & 0 deletions clients/src/main/java/org/apache/kafka/common/requests/DescribeConfigsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,11 @@ public int throttleTimeMs() {
return data.throttleTimeMs();
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
data.setThrottleTimeMs(throttleTimeMs);
}

@Override
public Map<Errors, Integer> errorCounts() {
Map<Errors, Integer> errorCounts = new HashMap<>();
Expand Down
5 changes: 5 additions & 0 deletions clients/src/main/java/org/apache/kafka/common/requests/DescribeDelegationTokenResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,11 @@ public int throttleTimeMs() {
return data.throttleTimeMs();
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
data.setThrottleTimeMs(throttleTimeMs);
}

public Errors error() {
return Errors.forCode(data.errorCode());
}
Expand Down
5 changes: 5 additions & 0 deletions clients/src/main/java/org/apache/kafka/common/requests/DescribeGroupsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,11 @@ public int throttleTimeMs() {
return data.throttleTimeMs();
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
data.setThrottleTimeMs(throttleTimeMs);
}

public static final String UNKNOWN_STATE = "";
public static final String UNKNOWN_PROTOCOL_TYPE = "";
public static final String UNKNOWN_PROTOCOL = "";
Expand Down
5 changes: 5 additions & 0 deletions clients/src/main/java/org/apache/kafka/common/requests/DescribeLogDirsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ public int throttleTimeMs() {
return data.throttleTimeMs();
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
data.setThrottleTimeMs(throttleTimeMs);
}

@Override
public Map<Errors, Integer> errorCounts() {
Map<Errors, Integer> errorCounts = new HashMap<>();
Expand Down
5 changes: 5 additions & 0 deletions clients/src/main/java/org/apache/kafka/common/requests/DescribeProducersResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,9 @@ public int throttleTimeMs() {
return data.throttleTimeMs();
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
data.setThrottleTimeMs(throttleTimeMs);
}

}
5 changes: 5 additions & 0 deletions clients/src/main/java/org/apache/kafka/common/requests/DescribeQuorumResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@ public int throttleTimeMs() {
return DEFAULT_THROTTLE_TIME;
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
// Not supported by the response schema
}

public static DescribeQuorumResponseData singletonErrorResponse(
TopicPartition topicPartition,
Errors error
Expand Down
6 changes: 6 additions & 0 deletions clients/src/main/java/org/apache/kafka/common/requests/DescribeTransactionsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,10 @@ public int throttleTimeMs() {
return data.throttleTimeMs();
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
data.setThrottleTimeMs(throttleTimeMs);
}

}

5 changes: 5 additions & 0 deletions .../src/main/java/org/apache/kafka/common/requests/DescribeUserScramCredentialsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ public int throttleTimeMs() {
return data.throttleTimeMs();
}

@Override
public void setThrottleTimeMs(int throttleTimeMs) {
data.setThrottleTimeMs(throttleTimeMs);
}

@Override
public Map<Errors, Integer> errorCounts() {
return errorCounts(data.results().stream().map(r -> Errors.forCode(r.errorCode())));
Expand Down
Loading