Skip to content

Commit 4534fe6

Browse files
committed
xds: Verify CSDS error responses do not complete
1 parent 4483d92 commit 4534fe6

2 files changed

Lines changed: 20 additions & 4 deletions

File tree

‎xds/src/main/java/io/grpc/xds/CsdsService.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@
6161
public final class CsdsService implements BindableService {
6262
private static final Logger logger = Logger.getLogger(CsdsService.class.getName());
6363
private final XdsClientPoolFactory xdsClientPoolFactory;
64-
private final CsdsServiceInternal delegate = new CsdsServiceInternal();
64+
@VisibleForTesting
65+
final CsdsServiceInternal delegate = new CsdsServiceInternal();
6566

6667
@VisibleForTesting
6768
CsdsService(XdsClientPoolFactory xdsClientPoolFactory) {
@@ -83,16 +84,14 @@ public ServerServiceDefinition bindService() {
8384
}
8485

8586
/** Hide protobuf from being exposed via the API. */
86-
private final class CsdsServiceInternal
87+
final class CsdsServiceInternal
8788
extends ClientStatusDiscoveryServiceGrpc.ClientStatusDiscoveryServiceImplBase {
8889
@Override
8990
public void fetchClientStatus(
9091
ClientStatusRequest request, StreamObserver<ClientStatusResponse> responseObserver) {
9192
if (handleRequest(request, responseObserver)) {
9293
responseObserver.onCompleted();
9394
}
94-
// TODO(sergiitk): Add a case covering mutating handleRequest return false to true - to verify
95-
// that responseObserver.onCompleted() isn't erroneously called on error.
9695
}
9796

9897
@Override

‎xds/src/test/java/io/grpc/xds/CsdsServiceTest.java‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818

1919
import static com.google.common.truth.Truth.assertThat;
2020
import static org.junit.Assert.fail;
21+
import static org.mockito.Mockito.mock;
22+
import static org.mockito.Mockito.never;
23+
import static org.mockito.Mockito.verify;
2124

2225
import com.google.common.collect.ImmutableList;
2326
import com.google.common.collect.ImmutableMap;
@@ -69,6 +72,7 @@
6972
import org.junit.experimental.runners.Enclosed;
7073
import org.junit.runner.RunWith;
7174
import org.junit.runners.JUnit4;
75+
import org.mockito.ArgumentCaptor;
7276

7377
/** Unit tests for {@link CsdsService}. */
7478
@RunWith(Enclosed.class)
@@ -133,6 +137,19 @@ public void fetchClientConfig_invalidArgument() {
133137
}
134138
}
135139

140+
@Test
141+
@SuppressWarnings("unchecked")
142+
public void fetchClientConfig_errorDoesNotComplete() {
143+
StreamObserver<ClientStatusResponse> responseObserver = mock(StreamObserver.class);
144+
145+
CSDS_SERVICE_MINIMAL.delegate.fetchClientStatus(REQUEST_INVALID, responseObserver);
146+
147+
ArgumentCaptor<Throwable> error = ArgumentCaptor.forClass(Throwable.class);
148+
verify(responseObserver).onError(error.capture());
149+
assertThat(Status.fromThrowable(error.getValue()).getCode()).isEqualTo(Code.INVALID_ARGUMENT);
150+
verify(responseObserver, never()).onCompleted();
151+
}
152+
136153
/** Unexpected exceptions translated to Status.Code.INTERNAL. */
137154
@Test
138155
public void fetchClientConfig_unexpectedException() {

0 commit comments

Comments
 (0)