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

core: Don't delegate inappropriate ConfigSelector errors (#9536) 

In case a control plane returns an "inappropriate" response code, it is converted to INTERNAL to highlight the bug in the control plane.

https://github.com/grpc/proposal/blob/master/A54-restrict-control-plane-status-codes.md
This commit is contained in:
Terry Wilson 2022-09-12 13:17:16 -07:00 committed by GitHub
parent bcf5cde7dd
commit 9853a0c463
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/io/grpc/internal/ManagedChannelImpl.java
View File

@ -1199,7 +1199,8 @@ final class ManagedChannelImpl extends ManagedChannel implements
InternalConfigSelector.Result result = configSelector.selectConfig(args);
Status status = result.getStatus();
if (!status.isOk()) {
executeCloseObserverInContext(observer, status);
executeCloseObserverInContext(observer,
GrpcUtil.replaceInappropriateControlPlaneStatus(status));
delegate = (ClientCall<ReqT, RespT>) NOOP_CALL;
return;
}

28
core/src/test/java/io/grpc/internal/ConfigSelectingClientCallTest.java
View File

@ -121,6 +121,31 @@ public class ConfigSelectingClientCallTest {
InternalConfigSelector configSelector = new InternalConfigSelector() {
@Override
public Result selectConfig(PickSubchannelArgs args) {
return Result.forError(Status.DEADLINE_EXCEEDED);
}
};
ClientCall<Void, Void> configSelectingClientCall = new ConfigSelectingClientCall<>(
configSelector,
channel,
MoreExecutors.directExecutor(),
method,
CallOptions.DEFAULT);
configSelectingClientCall.start(callListener, new Metadata());
ArgumentCaptor<Status> statusCaptor = ArgumentCaptor.forClass(null);
verify(callListener).onClose(statusCaptor.capture(), any(Metadata.class));
assertThat(statusCaptor.getValue().getCode()).isEqualTo(Status.Code.DEADLINE_EXCEEDED);
// The call should not delegate to null and fail methods with NPE.
configSelectingClientCall.request(1);
}
@Test
public void selectionErrorPropagatedToListener_inappropriateStatus() {
InternalConfigSelector configSelector = new InternalConfigSelector() {
@Override
public Result selectConfig(PickSubchannelArgs args) {
// This status code is considered inappropriate to propagate from the control plane...
return Result.forError(Status.FAILED_PRECONDITION);
}
};
@ -134,7 +159,8 @@ public class ConfigSelectingClientCallTest {
configSelectingClientCall.start(callListener, new Metadata());
ArgumentCaptor<Status> statusCaptor = ArgumentCaptor.forClass(null);
verify(callListener).onClose(statusCaptor.capture(), any(Metadata.class));
assertThat(statusCaptor.getValue().getCode()).isEqualTo(Status.Code.FAILED_PRECONDITION);
// ... so it should be represented as an internal error to highlight the control plane bug.
assertThat(statusCaptor.getValue().getCode()).isEqualTo(Status.Code.INTERNAL);
// The call should not delegate to null and fail methods with NPE.
configSelectingClientCall.request(1);