@@ -10446,10 +10446,6 @@ public void givenObservabilityModeFalse_whenExtProcBusy_thenAppRequestsAreBuffer
1044610446 .build())
1044710447 .build())
1044810448 .build())
10449- .setProcessingMode(ProcessingMode.newBuilder()
10450- .setResponseBodyMode(ProcessingMode.BodySendMode.GRPC)
10451- .setResponseTrailerMode(ProcessingMode.HeaderSendMode.SEND)
10452- .build())
1045310449 .setProcessingMode(ProcessingMode.newBuilder()
1045410450 .setRequestBodyMode(ProcessingMode.BodySendMode.GRPC)
1045510451 .setResponseBodyMode(ProcessingMode.BodySendMode.GRPC)
@@ -10664,6 +10660,168 @@ public void request(int numMessages) {
1066410660 channelManager.close();
1066510661 }
1066610662
10663+ @Test
10664+ @SuppressWarnings("unchecked")
10665+ public void givenResponseBodyModeNone_whenExtProcBusy_thenAppRequestsAreNotBuffered()
10666+ throws Exception {
10667+ ExternalProcessor proto = ExternalProcessor.newBuilder()
10668+ .setGrpcService(GrpcService.newBuilder()
10669+ .setGoogleGrpc(GrpcService.GoogleGrpc.newBuilder()
10670+ .setTargetUri("in-process:///" + extProcServerName)
10671+ .addChannelCredentialsPlugin(Any.newBuilder()
10672+ .setTypeUrl("type.googleapis.com/envoy.extensions.grpc_service."
10673+ + "channel_credentials.insecure.v3.InsecureCredentials")
10674+ .build())
10675+ .build())
10676+ .build())
10677+ .setProcessingMode(ProcessingMode.newBuilder()
10678+ .setRequestBodyMode(ProcessingMode.BodySendMode.GRPC)
10679+ .setResponseBodyMode(ProcessingMode.BodySendMode.NONE)
10680+ .setResponseHeaderMode(ProcessingMode.HeaderSendMode.SEND)
10681+ .setResponseTrailerMode(ProcessingMode.HeaderSendMode.SEND)
10682+ .build())
10683+ .setObservabilityMode(false)
10684+ .build();
10685+ ConfigOrError<ExternalProcessorFilterConfig> configOrError =
10686+ provider.parseFilterConfig(Any.pack(proto), filterContext);
10687+ assertThat(configOrError.errorDetail).isNull();
10688+ ExternalProcessorFilterConfig filterConfig = configOrError.config;
10689+
10690+ // Sidecar server
10691+ final CountDownLatch sidecarActionLatch = new CountDownLatch(1);
10692+ ExternalProcessorGrpc.ExternalProcessorImplBase extProcImpl;
10693+ extProcImpl = new ExternalProcessorGrpc.ExternalProcessorImplBase() {
10694+ @Override
10695+ @SuppressWarnings("unchecked")
10696+ public StreamObserver<ProcessingRequest> process(
10697+ final StreamObserver<ProcessingResponse> responseObserver) {
10698+ ((ServerCallStreamObserver<ProcessingResponse>) responseObserver).request(100);
10699+ return new StreamObserver<ProcessingRequest>() {
10700+ @Override
10701+ public void onNext(ProcessingRequest request) {
10702+ new Thread(() -> {
10703+ if (request.hasRequestHeaders()) {
10704+ sidecarActionLatch.countDown();
10705+ responseObserver.onNext(ProcessingResponse.newBuilder()
10706+ .setRequestHeaders(HeadersResponse.newBuilder().build())
10707+ .build());
10708+ }
10709+ }).start();
10710+ }
10711+
10712+ @Override
10713+ public void onError(Throwable t) {
10714+ }
10715+
10716+ @Override
10717+ public void onCompleted() {
10718+ new Thread(() -> responseObserver.onCompleted()).start();
10719+ }
10720+ };
10721+ }
10722+ };
10723+ grpcCleanup.register(InProcessServerBuilder.forName(extProcServerName)
10724+ .addService(extProcImpl)
10725+ .directExecutor()
10726+ .build().start());
10727+
10728+ final AtomicBoolean sidecarReady = new AtomicBoolean(true);
10729+ CachedChannelManager channelManager = new CachedChannelManager(config -> {
10730+ return grpcCleanup.register(
10731+ InProcessChannelBuilder.forName(extProcServerName)
10732+ .directExecutor()
10733+ .intercept(new ClientInterceptor() {
10734+ @Override
10735+ public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(
10736+ MethodDescriptor<ReqT, RespT> method, CallOptions callOptions, Channel next) {
10737+ return new io.grpc.ForwardingClientCall.SimpleForwardingClientCall<ReqT, RespT>(
10738+ next.newCall(method, callOptions)) {
10739+ @Override
10740+ public void start(Listener<RespT> responseListener, Metadata headers) {
10741+ super.start(responseListener, headers);
10742+ }
10743+
10744+ @Override
10745+ public boolean isReady() {
10746+ return sidecarReady.get();
10747+ }
10748+ };
10749+ }
10750+ })
10751+ .build());
10752+ });
10753+
10754+ ExternalProcessorClientInterceptor interceptor = new ExternalProcessorClientInterceptor(
10755+ filterConfig, channelManager, scheduler, FAKE_CONTEXT);
10756+
10757+ dataPlaneServiceRegistry.addService(ServerServiceDefinition.builder("test.TestService")
10758+ .addMethod(METHOD_BIDI_STREAMING, ServerCalls.asyncBidiStreamingCall(
10759+ new ServerCalls.BidiStreamingMethod<String, String>() {
10760+ @Override
10761+ public StreamObserver<String> invoke(StreamObserver<String> responseObserver) {
10762+ return new StreamObserver<String>() {
10763+ @Override
10764+ public void onNext(String value) {}
10765+ @Override
10766+ public void onError(Throwable t) {}
10767+ @Override
10768+ public void onCompleted() {}
10769+ };
10770+ }
10771+ }))
10772+ .build());
10773+
10774+ final AtomicInteger dataPlaneRequestCount = new AtomicInteger(0);
10775+ ManagedChannel dataPlaneChannel = grpcCleanup.register(
10776+ InProcessChannelBuilder.forName(dataPlaneServerName)
10777+ .directExecutor()
10778+ .intercept(new ClientInterceptor() {
10779+ @Override
10780+ public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(
10781+ MethodDescriptor<ReqT, RespT> method, CallOptions callOptions, Channel next) {
10782+ return new io.grpc.ForwardingClientCall.SimpleForwardingClientCall<ReqT, RespT>(
10783+ next.newCall(method, callOptions)) {
10784+ @Override
10785+ public void request(int numMessages) {
10786+ dataPlaneRequestCount.addAndGet(numMessages);
10787+ super.request(numMessages);
10788+ }
10789+ };
10790+ }
10791+ })
10792+ .build());
10793+
10794+ CallOptions callOptions = DEFAULT_CALL_OPTIONS.withExecutor(MoreExecutors.directExecutor());
10795+ ClientCall<String, String> proxyCall =
10796+ interceptCall(interceptor, METHOD_BIDI_STREAMING, callOptions, dataPlaneChannel);
10797+ proxyCall.start(new ClientCall.Listener<String>() {}, new Metadata());
10798+ proxyCall.request(1); // Bootstrap request
10799+
10800+ // Wait for activation
10801+ assertThat(sidecarActionLatch.await(5, TimeUnit.SECONDS)).isTrue();
10802+ for (int i = 0; i < 50 && !proxyCall.isReady(); i++) {
10803+ fakeClock.forwardTime(100, TimeUnit.MILLISECONDS);
10804+ Thread.sleep(10);
10805+ }
10806+ assertThat(proxyCall.isReady()).isTrue();
10807+
10808+ // Sidecar busy
10809+ sidecarReady.set(false);
10810+
10811+ // Since responseBodyMode is NONE and not in observabilityMode, request(5) should be passed upstream immediately
10812+ proxyCall.request(5);
10813+
10814+ long startTime = System.currentTimeMillis();
10815+ while (dataPlaneRequestCount.get() < 6 && System.currentTimeMillis() - startTime < 5000) {
10816+ fakeClock.forwardTime(1, TimeUnit.SECONDS);
10817+ Thread.sleep(10);
10818+ }
10819+ assertThat(dataPlaneRequestCount.get()).isEqualTo(6); // 1 bootstrap + 5 requested
10820+
10821+ proxyCall.cancel("Cleanup", null);
10822+ channelManager.close();
10823+ }
10824+
1066710825 // --- Category 21: Streaming Completeness (Client & Bi-Di) ---
1066810826
1066910827 @Test
0 commit comments