Skip to content

Commit 64aba22

Browse files
committed
Include max concurrent request limit in the error status for concurrent connections limit exceeded
1 parent fc86084 commit 64aba22

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

xds/src/main/java/io/grpc/xds/ClusterImplLoadBalancer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,8 @@ public PickResult pickSubchannel(PickSubchannelArgs args) {
406406
dropStats.recordDroppedRequest();
407407
}
408408
return PickResult.withDrop(Status.UNAVAILABLE.withDescription(
409-
"Cluster max concurrent requests limit exceeded"));
409+
String.format("Cluster max concurrent requests limit of %d exceeded",
410+
maxConcurrentRequests)));
410411
}
411412
}
412413
final AtomicReference<ClusterLocality> clusterLocality =

xds/src/test/java/io/grpc/xds/ClusterImplLoadBalancerTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ private void subtest_maxConcurrentRequests_appliedByLbConfig(boolean enableCircu
636636
assertThat(result.getStatus().isOk()).isFalse();
637637
assertThat(result.getStatus().getCode()).isEqualTo(Code.UNAVAILABLE);
638638
assertThat(result.getStatus().getDescription())
639-
.isEqualTo("Cluster max concurrent requests limit exceeded");
639+
.isEqualTo("Cluster max concurrent requests limit of 100 exceeded");
640640
assertThat(clusterStats.totalDroppedRequests()).isEqualTo(1L);
641641
} else {
642642
assertThat(result.getStatus().isOk()).isTrue();
@@ -667,7 +667,7 @@ private void subtest_maxConcurrentRequests_appliedByLbConfig(boolean enableCircu
667667
assertThat(result.getStatus().isOk()).isFalse();
668668
assertThat(result.getStatus().getCode()).isEqualTo(Code.UNAVAILABLE);
669669
assertThat(result.getStatus().getDescription())
670-
.isEqualTo("Cluster max concurrent requests limit exceeded");
670+
.isEqualTo("Cluster max concurrent requests limit of 101 exceeded");
671671
assertThat(clusterStats.totalDroppedRequests()).isEqualTo(1L);
672672
} else {
673673
assertThat(result.getStatus().isOk()).isTrue();
@@ -731,7 +731,7 @@ private void subtest_maxConcurrentRequests_appliedWithDefaultValue(
731731
assertThat(result.getStatus().isOk()).isFalse();
732732
assertThat(result.getStatus().getCode()).isEqualTo(Code.UNAVAILABLE);
733733
assertThat(result.getStatus().getDescription())
734-
.isEqualTo("Cluster max concurrent requests limit exceeded");
734+
.isEqualTo("Cluster max concurrent requests limit of 1024 exceeded");
735735
assertThat(clusterStats.totalDroppedRequests()).isEqualTo(1L);
736736
} else {
737737
assertThat(result.getStatus().isOk()).isTrue();

0 commit comments

Comments
 (0)