Skip to content

fix(api): fix channel isn't switch when encounter NOT_CONTROLLER #1489

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
merged 1 commit into from
Jun 28, 2024
Merged

fix(api): fix channel isn't switch when encounter NOT_CONTROLLER #1489

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
6 changes: 5 additions & 1 deletion clients/src/main/java/org/apache/kafka/common/requests/s3/CloseStreamsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.kafka.common.requests.s3;

import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.kafka.common.message.CloseStreamsResponseData;
Expand Down Expand Up @@ -47,7 +48,10 @@ public CloseStreamsResponseData data() {

@Override
public Map<Errors, Integer> errorCounts() {
return errorCounts(Errors.forCode(data.errorCode()));
Map<Errors, Integer> errorCounts = new HashMap<>();
updateErrorCounts(errorCounts, Errors.forCode(data.errorCode()));
data.closeStreamResponses().forEach(response -> updateErrorCounts(errorCounts, Errors.forCode(response.errorCode())));
return errorCounts;
}

@Override
Expand Down
6 changes: 5 additions & 1 deletion clients/src/main/java/org/apache/kafka/common/requests/s3/CreateStreamsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.kafka.common.requests.s3;

import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.kafka.common.message.CreateStreamsResponseData;
Expand Down Expand Up @@ -47,7 +48,10 @@ public CreateStreamsResponseData data() {

@Override
public Map<Errors, Integer> errorCounts() {
return errorCounts(Errors.forCode(data.errorCode()));
Map<Errors, Integer> errorCounts = new HashMap<>();
updateErrorCounts(errorCounts, Errors.forCode(data.errorCode()));
data.createStreamResponses().forEach(response -> updateErrorCounts(errorCounts, Errors.forCode(response.errorCode())));
return errorCounts;
}

@Override
Expand Down
6 changes: 5 additions & 1 deletion clients/src/main/java/org/apache/kafka/common/requests/s3/DeleteKVsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.kafka.common.requests.s3;

import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.kafka.common.message.DeleteKVsResponseData;
Expand Down Expand Up @@ -46,7 +47,10 @@ public DeleteKVsResponseData data() {

@Override
public Map<Errors, Integer> errorCounts() {
return errorCounts(Errors.forCode(data.errorCode()));
Map<Errors, Integer> errorCounts = new HashMap<>();
updateErrorCounts(errorCounts, Errors.forCode(data.errorCode()));
data.deleteKVResponses().forEach(response -> updateErrorCounts(errorCounts, Errors.forCode(response.errorCode())));
return errorCounts;
}

@Override
Expand Down
6 changes: 5 additions & 1 deletion clients/src/main/java/org/apache/kafka/common/requests/s3/DeleteStreamsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.apache.kafka.common.requests.s3;

import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.kafka.common.message.DeleteStreamsResponseData;
Expand All @@ -42,7 +43,10 @@ public DeleteStreamsResponseData data() {

@Override
public Map<Errors, Integer> errorCounts() {
return errorCounts(Errors.forCode(data.errorCode()));
Map<Errors, Integer> errorCounts = new HashMap<>();
updateErrorCounts(errorCounts, Errors.forCode(data.errorCode()));
data.deleteStreamResponses().forEach(response -> updateErrorCounts(errorCounts, Errors.forCode(response.errorCode())));
return errorCounts;
}

@Override
Expand Down
5 changes: 4 additions & 1 deletion clients/src/main/java/org/apache/kafka/common/requests/s3/DescribeStreamsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
package org.apache.kafka.common.requests.s3;

import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.Map;
import org.apache.kafka.common.message.DescribeStreamsResponseData;
import org.apache.kafka.common.protocol.ApiKeys;
Expand All @@ -34,7 +35,9 @@ public DescribeStreamsResponseData data() {

@Override
public Map<Errors, Integer> errorCounts() {
return errorCounts(Errors.forCode(data.errorCode()));
Map<Errors, Integer> errorCounts = new HashMap<>();
updateErrorCounts(errorCounts, Errors.forCode(data.errorCode()));
return errorCounts;
}

@Override
Expand Down
6 changes: 5 additions & 1 deletion clients/src/main/java/org/apache/kafka/common/requests/s3/GetKVsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.kafka.common.requests.s3;

import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.kafka.common.message.GetKVsResponseData;
Expand Down Expand Up @@ -47,7 +48,10 @@ public GetKVsResponseData data() {

@Override
public Map<Errors, Integer> errorCounts() {
return errorCounts(Errors.forCode(data.errorCode()));
Map<Errors, Integer> errorCounts = new HashMap<>();
updateErrorCounts(errorCounts, Errors.forCode(data.errorCode()));
data.getKVResponses().forEach(response -> updateErrorCounts(errorCounts, Errors.forCode(response.errorCode())));
return errorCounts;
}

@Override
Expand Down
6 changes: 5 additions & 1 deletion clients/src/main/java/org/apache/kafka/common/requests/s3/OpenStreamsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.kafka.common.requests.s3;

import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.kafka.common.message.OpenStreamsResponseData;
Expand Down Expand Up @@ -47,7 +48,10 @@ public OpenStreamsResponseData data() {

@Override
public Map<Errors, Integer> errorCounts() {
return errorCounts(Errors.forCode(data.errorCode()));
Map<Errors, Integer> errorCounts = new HashMap<>();
updateErrorCounts(errorCounts, Errors.forCode(data.errorCode()));
data.openStreamResponses().forEach(response -> updateErrorCounts(errorCounts, Errors.forCode(response.errorCode())));
return errorCounts;
}

@Override
Expand Down
6 changes: 5 additions & 1 deletion clients/src/main/java/org/apache/kafka/common/requests/s3/PutKVsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.kafka.common.requests.s3;

import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.kafka.common.message.PutKVsResponseData;
Expand Down Expand Up @@ -46,7 +47,10 @@ public PutKVsResponseData data() {

@Override
public Map<Errors, Integer> errorCounts() {
return errorCounts(Errors.forCode(data.errorCode()));
Map<Errors, Integer> errorCounts = new HashMap<>();
updateErrorCounts(errorCounts, Errors.forCode(data.errorCode()));
data.putKVResponses().forEach(response -> updateErrorCounts(errorCounts, Errors.forCode(response.errorCode())));
return errorCounts;
}

@Override
Expand Down
6 changes: 5 additions & 1 deletion clients/src/main/java/org/apache/kafka/common/requests/s3/TrimStreamsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.kafka.common.requests.s3;

import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.kafka.common.message.TrimStreamsResponseData;
Expand Down Expand Up @@ -47,7 +48,10 @@ public TrimStreamsResponseData data() {

@Override
public Map<Errors, Integer> errorCounts() {
return errorCounts(Errors.forCode(data.errorCode()));
Map<Errors, Integer> errorCounts = new HashMap<>();
updateErrorCounts(errorCounts, Errors.forCode(data.errorCode()));
data.trimStreamResponses().forEach(response -> updateErrorCounts(errorCounts, Errors.forCode(response.errorCode())));
return errorCounts;
}

@Override
Expand Down