flasn4nt
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xds: Include max concurrent request limit in the error status for concurre… (#11845) 

Include max concurrent request limit in the error status for concurrent connections limit exceeded
This commit is contained in:
Kannan J 2025-01-23 16:10:21 +00:00 committed by GitHub
parent 495a8906b2
commit 0f5503ebb1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xds/src/main/java/io/grpc/xds/ClusterImplLoadBalancer.java
View File

@ -59,6 +59,7 @@ import io.grpc.xds.orca.OrcaPerRequestUtil.OrcaPerRequestReportListener;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLong;
@ -406,7 +407,8 @@ final class ClusterImplLoadBalancer extends LoadBalancer {
dropStats.recordDroppedRequest(); dropStats.recordDroppedRequest();
} }
return PickResult.withDrop(Status.UNAVAILABLE.withDescription( return PickResult.withDrop(Status.UNAVAILABLE.withDescription(
"Cluster max concurrent requests limit exceeded")); String.format(Locale.US, "Cluster max concurrent requests limit of %d exceeded",
maxConcurrentRequests)));
} }
} }
final AtomicReference<ClusterLocality> clusterLocality = final AtomicReference<ClusterLocality> clusterLocality =

6
xds/src/test/java/io/grpc/xds/ClusterImplLoadBalancerTest.java
View File

@ -636,7 +636,7 @@ public class ClusterImplLoadBalancerTest {
assertThat(result.getStatus().isOk()).isFalse(); assertThat(result.getStatus().isOk()).isFalse();
assertThat(result.getStatus().getCode()).isEqualTo(Code.UNAVAILABLE); assertThat(result.getStatus().getCode()).isEqualTo(Code.UNAVAILABLE);
assertThat(result.getStatus().getDescription()) assertThat(result.getStatus().getDescription())
.isEqualTo("Cluster max concurrent requests limit exceeded"); .isEqualTo("Cluster max concurrent requests limit of 100 exceeded");
assertThat(clusterStats.totalDroppedRequests()).isEqualTo(1L); assertThat(clusterStats.totalDroppedRequests()).isEqualTo(1L);
} else { } else {
assertThat(result.getStatus().isOk()).isTrue(); assertThat(result.getStatus().isOk()).isTrue();
@ -667,7 +667,7 @@ public class ClusterImplLoadBalancerTest {
assertThat(result.getStatus().isOk()).isFalse(); assertThat(result.getStatus().isOk()).isFalse();
assertThat(result.getStatus().getCode()).isEqualTo(Code.UNAVAILABLE); assertThat(result.getStatus().getCode()).isEqualTo(Code.UNAVAILABLE);
assertThat(result.getStatus().getDescription()) assertThat(result.getStatus().getDescription())
.isEqualTo("Cluster max concurrent requests limit exceeded"); .isEqualTo("Cluster max concurrent requests limit of 101 exceeded");
assertThat(clusterStats.totalDroppedRequests()).isEqualTo(1L); assertThat(clusterStats.totalDroppedRequests()).isEqualTo(1L);
} else { } else {
assertThat(result.getStatus().isOk()).isTrue(); assertThat(result.getStatus().isOk()).isTrue();
@ -731,7 +731,7 @@ public class ClusterImplLoadBalancerTest {
assertThat(result.getStatus().isOk()).isFalse(); assertThat(result.getStatus().isOk()).isFalse();
assertThat(result.getStatus().getCode()).isEqualTo(Code.UNAVAILABLE); assertThat(result.getStatus().getCode()).isEqualTo(Code.UNAVAILABLE);
assertThat(result.getStatus().getDescription()) assertThat(result.getStatus().getDescription())
.isEqualTo("Cluster max concurrent requests limit exceeded"); .isEqualTo("Cluster max concurrent requests limit of 1024 exceeded");
assertThat(clusterStats.totalDroppedRequests()).isEqualTo(1L); assertThat(clusterStats.totalDroppedRequests()).isEqualTo(1L);
} else { } else {
assertThat(result.getStatus().isOk()).isTrue(); assertThat(result.getStatus().isOk()).isTrue();