Skip to content

KAFKA-20443: Move RequestChannel Requests to server module #22075

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 5 commits into from
May 15, 2026
Merged

KAFKA-20443: Move RequestChannel Requests to server module #22075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6d7f79a
KAFKA-20443: Move RequestChannel Requests to server module
mimaison Apr 14, 2026
6b5c201
Address feedback from Ken
mimaison Apr 21, 2026
e300bc3
Address feedback from Chia-Ping
mimaison May 11, 2026
5eddced
Re-add Math.max
mimaison May 12, 2026
6e6c113
Use switch block
mimaison May 12, 2026
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
1 change: 1 addition & 0 deletions checkstyle/import-control-server.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@

<subpackage name="network">
<allow pkg="com.fasterxml.jackson" />
<allow pkg="org.apache.kafka.network.metrics" />
</subpackage>

</import-control>
19 changes: 9 additions & 10 deletions core/src/main/java/kafka/server/ClientRequestQuotaManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,14 @@
*/
package kafka.server;

import kafka.network.RequestChannel;

import org.apache.kafka.common.MetricName;
import org.apache.kafka.common.internals.Plugin;
import org.apache.kafka.common.metrics.Metrics;
import org.apache.kafka.common.metrics.QuotaViolationException;
import org.apache.kafka.common.metrics.Sensor;
import org.apache.kafka.common.metrics.stats.Rate;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.network.Request;
import org.apache.kafka.server.config.ClientQuotaManagerConfig;
import org.apache.kafka.server.quota.ClientQuotaCallback;
import org.apache.kafka.server.quota.ClientQuotaManager;
Expand Down Expand Up @@ -76,22 +75,22 @@ private void recordExempt(double value) {
* @param request client request
* @return Number of milliseconds to throttle in case of quota violation. Zero otherwise
*/
public int maybeRecordAndGetThrottleTimeMs(RequestChannel.Request request, long timeMs) {
public int maybeRecordAndGetThrottleTimeMs(Request request, long timeMs) {
if (quotasEnabled()) {
request.setRecordNetworkThreadTimeCallback(timeNanos -> {
recordNoThrottle(request.session(), request.header().clientId(), nanosToPercentage(Long.parseLong(timeNanos.toString())));
});
request.setRecordNetworkThreadTimeCallback(timeNanos ->
recordNoThrottle(request.session(), request.header().clientId(), nanosToPercentage(timeNanos))
);
return recordAndGetThrottleTimeMs(request.session(), request.header().clientId(), nanosToPercentage(request.requestThreadTimeNanos()), timeMs);
} else {
return 0;
}
}

public void maybeRecordExempt(RequestChannel.Request request) {
public void maybeRecordExempt(Request request) {
if (quotasEnabled()) {
request.setRecordNetworkThreadTimeCallback(timeNanos -> {
recordExempt(nanosToPercentage(Long.parseLong(timeNanos.toString())));
});
request.setRecordNetworkThreadTimeCallback(timeNanos ->
recordExempt(nanosToPercentage(timeNanos))
);
recordExempt(nanosToPercentage(request.requestThreadTimeNanos()));
}
}
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/kafka/server/handlers/DescribeTopicPartitionsRequestHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

package kafka.server.handlers;

import kafka.network.RequestChannel;
import kafka.server.AuthHelper;
import kafka.server.KafkaConfig;

Expand All @@ -31,6 +30,7 @@
import org.apache.kafka.common.requests.DescribeTopicPartitionsRequest;
import org.apache.kafka.common.resource.Resource;
import org.apache.kafka.metadata.MetadataCache;
import org.apache.kafka.network.Request;

import java.util.HashSet;
import java.util.List;
Expand All @@ -55,7 +55,7 @@ public DescribeTopicPartitionsRequestHandler(
this.config = config;
}

public DescribeTopicPartitionsResponseData handleDescribeTopicPartitionsRequest(RequestChannel.Request abstractRequest) {
public DescribeTopicPartitionsResponseData handleDescribeTopicPartitionsRequest(Request abstractRequest) {
DescribeTopicPartitionsRequestData request = ((DescribeTopicPartitionsRequest) abstractRequest.loggableRequest()).data();
Set<String> topics = new HashSet<>();
boolean fetchAllTopics = request.topics().isEmpty();
Expand Down
Loading
Loading