Skip to content
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.

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

xds: fixed unsupported unsigned 32 bits issue for circuit breaker (1.69.x backport) #11832

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion xds/src/main/java/io/grpc/xds/XdsClusterResource.java
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ private static StructOrError<CdsUpdate.Builder> parseNonAggregateCluster(
continue;
}
if (threshold.hasMaxRequests()) {
maxConcurrentRequests = (long) threshold.getMaxRequests().getValue();
maxConcurrentRequests = Integer.toUnsignedLong(threshold.getMaxRequests().getValue());
}
}
}
Expand Down
19 changes: 19 additions & 0 deletions xds/src/test/java/io/grpc/xds/GrpcXdsClientImplTestBase.java
Original file line number Diff line number Diff line change
Expand Up @@ -3972,6 +3972,25 @@ public void sendToBadUrl() throws Exception {
client.shutdown();
}

@Test
public void circuitBreakingConversionOf32bitIntTo64bitLongForMaxRequestNegativeValue() {
DiscoveryRpcCall call = startResourceWatcher(XdsClusterResource.getInstance(), CDS_RESOURCE,
cdsResourceWatcher);
Any clusterCircuitBreakers = Any.pack(
mf.buildEdsCluster(CDS_RESOURCE, null, "round_robin", null, null, false, null,
"envoy.transport_sockets.tls", mf.buildCircuitBreakers(50, -1), null));
call.sendResponse(CDS, clusterCircuitBreakers, VERSION_1, "0000");

// Client sent an ACK CDS request.
call.verifyRequest(CDS, CDS_RESOURCE, VERSION_1, "0000", NODE);
verify(cdsResourceWatcher).onChanged(cdsUpdateCaptor.capture());
CdsUpdate cdsUpdate = cdsUpdateCaptor.getValue();

assertThat(cdsUpdate.clusterName()).isEqualTo(CDS_RESOURCE);
assertThat(cdsUpdate.clusterType()).isEqualTo(ClusterType.EDS);
assertThat(cdsUpdate.maxConcurrentRequests()).isEqualTo(4294967295L);
}

@Test
public void sendToNonexistentServer() throws Exception {
// Setup xdsClient to fail on stream creation
Expand Down
Loading