Skip to content

Commit 4e01052

Browse files
committed
Make givenObservabilityModeFalse_whenExtProcBusy_thenAppRequestsAreBuffered use response processing mode GRPC so that buffered requests are actually sent to ext_proc instead of directly upstream in this test.
1 parent 5713e3f commit 4e01052

1 file changed

Lines changed: 84 additions & 8 deletions

File tree

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

Lines changed: 84 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9980,6 +9980,12 @@ public void givenObservabilityModeFalse_whenExtProcBusy_thenAppRequestsAreBuffer
99809980
.build())
99819981
.build())
99829982
.build())
9983+
.setProcessingMode(ProcessingMode.newBuilder()
9984+
.setRequestBodyMode(ProcessingMode.BodySendMode.GRPC)
9985+
.setResponseBodyMode(ProcessingMode.BodySendMode.GRPC)
9986+
.setResponseHeaderMode(ProcessingMode.HeaderSendMode.SEND)
9987+
.setResponseTrailerMode(ProcessingMode.HeaderSendMode.SEND)
9988+
.build())
99839989
.setObservabilityMode(false)
99849990
.build();
99859991
ConfigOrError<ExternalProcessorFilterConfig> configOrError =
@@ -10005,6 +10011,22 @@ public void onNext(ProcessingRequest request) {
1000510011
responseObserver.onNext(ProcessingResponse.newBuilder()
1000610012
.setRequestHeaders(HeadersResponse.newBuilder().build())
1000710013
.build());
10014+
} else if (request.hasResponseHeaders()) {
10015+
responseObserver.onNext(ProcessingResponse.newBuilder()
10016+
.setResponseHeaders(HeadersResponse.newBuilder().build())
10017+
.build());
10018+
} else if (request.hasResponseBody()) {
10019+
responseObserver.onNext(ProcessingResponse.newBuilder()
10020+
.setResponseBody(BodyResponse.newBuilder()
10021+
.setResponse(CommonResponse.newBuilder()
10022+
.setBodyMutation(BodyMutation.newBuilder()
10023+
.setStreamedResponse(StreamedBodyResponse.newBuilder()
10024+
.setBody(request.getResponseBody().getBody())
10025+
.build())
10026+
.build())
10027+
.build())
10028+
.build())
10029+
.build());
1000810030
}
1000910031
}).start();
1001010032
}
@@ -10057,11 +10079,22 @@ public boolean isReady() {
1005710079
ExternalProcessorClientInterceptor interceptor = new ExternalProcessorClientInterceptor(
1005810080
filterConfig, channelManager, scheduler, FAKE_CONTEXT);
1005910081

10082+
final AtomicReference<StreamObserver<String>> dataPlaneResponseObserverRef = new AtomicReference<>();
1006010083
dataPlaneServiceRegistry.addService(ServerServiceDefinition.builder("test.TestService")
10061-
.addMethod(METHOD_SAY_HELLO, ServerCalls.asyncUnaryCall(
10062-
(request, responseObserver) -> {
10063-
responseObserver.onNext("Hello");
10064-
responseObserver.onCompleted();
10084+
.addMethod(METHOD_BIDI_STREAMING, ServerCalls.asyncBidiStreamingCall(
10085+
new ServerCalls.BidiStreamingMethod<String, String>() {
10086+
@Override
10087+
public StreamObserver<String> invoke(StreamObserver<String> responseObserver) {
10088+
dataPlaneResponseObserverRef.set(responseObserver);
10089+
return new StreamObserver<String>() {
10090+
@Override
10091+
public void onNext(String value) {}
10092+
@Override
10093+
public void onError(Throwable t) {}
10094+
@Override
10095+
public void onCompleted() {}
10096+
};
10097+
}
1006510098
}))
1006610099
.build());
1006710100

@@ -10087,8 +10120,9 @@ public void request(int numMessages) {
1008710120

1008810121
CallOptions callOptions = DEFAULT_CALL_OPTIONS.withExecutor(MoreExecutors.directExecutor());
1008910122
ClientCall<String, String> proxyCall =
10090-
interceptCall(interceptor, METHOD_SAY_HELLO, callOptions, dataPlaneChannel);
10123+
interceptCall(interceptor, METHOD_BIDI_STREAMING, callOptions, dataPlaneChannel);
1009110124
proxyCall.start(new ClientCall.Listener<String>() {}, new Metadata());
10125+
proxyCall.request(1); // Bootstrap request for headers
1009210126

1009310127
// Wait for activation
1009410128
assertThat(sidecarActionLatch.await(5, TimeUnit.SECONDS)).isTrue();
@@ -10101,19 +10135,61 @@ public void request(int numMessages) {
1010110135
// Sidecar busy -> request(5) should be buffered
1010210136
sidecarReady.set(false);
1010310137
proxyCall.request(5);
10104-
assertThat(dataPlaneRequestCount.get()).isEqualTo(0);
10138+
assertThat(dataPlaneRequestCount.get()).isEqualTo(1); // Only the initial bootstrap request went through
1010510139

10106-
// Sidecar becomes ready -> buffered requests should be drained
10140+
// Sidecar becomes ready -> buffered requests should start draining (pulling next message)
1010710141
sidecarReady.set(true);
1010810142
sidecarListenerRef.get().onReady();
10109-
10143+
1011010144
long startTime2 = System.currentTimeMillis();
10145+
while (dataPlaneRequestCount.get() < 2 && System.currentTimeMillis() - startTime2 < 5000) {
10146+
fakeClock.forwardTime(1, TimeUnit.SECONDS);
10147+
Thread.sleep(10);
10148+
}
10149+
assertThat(dataPlaneRequestCount.get()).isEqualTo(2);
10150+
10151+
StreamObserver<String> upstreamResponseObserver = dataPlaneResponseObserverRef.get();
10152+
10153+
// Server sends response headers (Dummy)
10154+
upstreamResponseObserver.onNext("Dummy for headers");
10155+
10156+
startTime2 = System.currentTimeMillis();
10157+
while (dataPlaneRequestCount.get() < 3 && System.currentTimeMillis() - startTime2 < 5000) {
10158+
fakeClock.forwardTime(1, TimeUnit.SECONDS);
10159+
Thread.sleep(10);
10160+
}
10161+
assertThat(dataPlaneRequestCount.get()).isEqualTo(3);
10162+
10163+
// Server sends first data message -> pulls next
10164+
upstreamResponseObserver.onNext("Msg 1");
10165+
10166+
startTime2 = System.currentTimeMillis();
10167+
while (dataPlaneRequestCount.get() < 4 && System.currentTimeMillis() - startTime2 < 5000) {
10168+
fakeClock.forwardTime(1, TimeUnit.SECONDS);
10169+
Thread.sleep(10);
10170+
}
10171+
assertThat(dataPlaneRequestCount.get()).isEqualTo(4);
10172+
10173+
// Server sends second data message -> pulls next
10174+
upstreamResponseObserver.onNext("Msg 2");
10175+
10176+
startTime2 = System.currentTimeMillis();
1011110177
while (dataPlaneRequestCount.get() < 5 && System.currentTimeMillis() - startTime2 < 5000) {
1011210178
fakeClock.forwardTime(1, TimeUnit.SECONDS);
1011310179
Thread.sleep(10);
1011410180
}
1011510181
assertThat(dataPlaneRequestCount.get()).isEqualTo(5);
1011610182

10183+
// Server sends third data message -> pulls next (which drains the final pending request)
10184+
upstreamResponseObserver.onNext("Msg 3");
10185+
10186+
startTime2 = System.currentTimeMillis();
10187+
while (dataPlaneRequestCount.get() < 6 && System.currentTimeMillis() - startTime2 < 5000) {
10188+
fakeClock.forwardTime(1, TimeUnit.SECONDS);
10189+
Thread.sleep(10);
10190+
}
10191+
assertThat(dataPlaneRequestCount.get()).isEqualTo(6);
10192+
1011710193
proxyCall.cancel("Cleanup", null);
1011810194
channelManager.close();
1011910195
}

0 commit comments

Comments
 (0)