Skip to content

Commit d13bb94

Browse files
committed
xds: treat ext_proc stream OK termination without drain as non-OK status
Update ext_proc client interceptor to treat OK termination without drain as non-OK status regardless of whether messages have started being sent to the ext_proc server, in accordance with the updated gRFC specification. TAG=agy CONV=2c1e4760-c239-4698-810a-162bf10fccc4
1 parent 80227c9 commit d13bb94

2 files changed

Lines changed: 149 additions & 99 deletions

File tree

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

Lines changed: 74 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -322,8 +322,6 @@ private static class DataPlaneClientCall
322322
final AtomicBoolean responseDrainComplete = new AtomicBoolean(false);
323323
final AtomicBoolean requestEosSent = new AtomicBoolean(false);
324324
final AtomicBoolean responseTrailersSent = new AtomicBoolean(false);
325-
final AtomicBoolean requestBodySentToExtProc = new AtomicBoolean(false);
326-
final AtomicBoolean responseBodySentToExtProc = new AtomicBoolean(false);
327325

328326
protected DataPlaneClientCall(
329327
DataPlaneDelayedCall<InputStream, InputStream> delayedCall,
@@ -491,43 +489,55 @@ public void onNext(ProcessingResponse response) {
491489
}
492490
expectedResponseResponse = null;
493491
} else if (response.hasRequestBody()) {
494-
EventType expected = expectedRequestResponse;
495-
if (expected == EventType.REQUEST_HEADERS) {
496-
internalOnError(Status.UNAVAILABLE
497-
.withDescription(
498-
"Protocol error: received request_body before request_headers response.")
499-
.asRuntimeException());
500-
return;
492+
if (!isDrainComplete(response.getRequestBody())) {
493+
EventType expected = expectedRequestResponse;
494+
if (expected == EventType.REQUEST_HEADERS) {
495+
internalOnError(Status.UNAVAILABLE
496+
.withDescription(
497+
"Protocol error: received request_body before request_headers response.")
498+
.asRuntimeException());
499+
return;
500+
}
501501
}
502502
} else if (response.hasResponseBody()) {
503-
EventType expected = expectedResponseResponse;
504-
if (expected == EventType.RESPONSE_HEADERS) {
505-
internalOnError(Status.UNAVAILABLE
506-
.withDescription(
507-
"Protocol error: received response_body before headers response.")
508-
.asRuntimeException());
509-
return;
503+
if (!isDrainComplete(response.getResponseBody())) {
504+
EventType expected = expectedResponseResponse;
505+
if (expected == EventType.RESPONSE_HEADERS) {
506+
internalOnError(Status.UNAVAILABLE
507+
.withDescription(
508+
"Protocol error: received response_body before headers response.")
509+
.asRuntimeException());
510+
return;
511+
}
510512
}
511513
}
512514

513515
if (response.getRequestDrainRequests()) {
514-
if (!requestEosSent.get() && requestDraining.compareAndSet(false, true)) {
515-
activateCall();
516-
sendToExtProc(ProcessingRequest.newBuilder()
517-
.setRequestBody(HttpBody.newBuilder()
518-
.setDrainComplete(true)
519-
.build())
520-
.build());
516+
if (!requestEosSent.get()) {
517+
if (requestDraining.compareAndSet(false, true)) {
518+
activateCall();
519+
sendToExtProc(ProcessingRequest.newBuilder()
520+
.setRequestBody(HttpBody.newBuilder()
521+
.setDrainComplete(true)
522+
.build())
523+
.build());
524+
}
525+
} else {
526+
requestDrainComplete.set(true);
521527
}
522528
}
523529
if (response.getRequestDrainResponses()) {
524-
if (!responseTrailersSent.get() && responseDraining.compareAndSet(false, true)) {
525-
activateCall();
526-
sendToExtProc(ProcessingRequest.newBuilder()
527-
.setResponseBody(HttpBody.newBuilder()
528-
.setDrainComplete(true)
529-
.build())
530-
.build());
530+
if (!responseTrailersSent.get()) {
531+
if (responseDraining.compareAndSet(false, true)) {
532+
activateCall();
533+
sendToExtProc(ProcessingRequest.newBuilder()
534+
.setResponseBody(HttpBody.newBuilder()
535+
.setDrainComplete(true)
536+
.build())
537+
.build());
538+
}
539+
} else {
540+
responseDrainComplete.set(true);
531541
}
532542
}
533543

@@ -622,35 +632,32 @@ public void onError(Throwable t) {
622632

623633
@Override
624634
public void onCompleted() {
625-
boolean requestDrainRequired =
626-
currentProcessingMode.getRequestBodyMode() == ProcessingMode.BodySendMode.GRPC
627-
&& requestBodySentToExtProc.get()
628-
&& !requestDrainComplete.get()
629-
&& !requestEosSent.get();
630-
631-
boolean responseDrainRequired =
632-
currentProcessingMode.getResponseBodyMode() == ProcessingMode.BodySendMode.GRPC
633-
&& responseBodySentToExtProc.get()
634-
&& !responseDrainComplete.get()
635-
&& !responseTrailersSent.get();
636-
637-
if (!config.getObservabilityMode() && (requestDrainRequired || responseDrainRequired)) {
638-
if (markExtProcStreamFailed(extProcStreamState)) {
639-
synchronized (streamLock) {
640-
extProcClientCallRequestObserver = null;
635+
ExtProcStreamState state = extProcStreamState.get();
636+
if (state == ExtProcStreamState.ACTIVE) {
637+
boolean requestDrainRequired =
638+
currentProcessingMode.getRequestBodyMode() == ProcessingMode.BodySendMode.GRPC
639+
&& !requestDrainComplete.get()
640+
&& !requestEosSent.get();
641+
boolean responseDrainRequired =
642+
currentProcessingMode.getResponseBodyMode() == ProcessingMode.BodySendMode.GRPC
643+
&& !responseDrainComplete.get()
644+
&& !responseTrailersSent.get();
645+
boolean drained =
646+
(requestDrainComplete.get() || responseDrainComplete.get())
647+
&& !requestDrainRequired
648+
&& !responseDrainRequired;
649+
if (config.getObservabilityMode() || drained) {
650+
if (markExtProcStreamCompleted(extProcStreamState)) {
651+
synchronized (streamLock) {
652+
extProcClientCallRequestObserver = null;
653+
}
654+
handleFailOpen(wrappedListener);
641655
}
642-
cancelDownstream(
643-
"External processor stream completed without drain",
644-
Status.INTERNAL
645-
.withDescription("External processor stream completed without drain")
646-
.asRuntimeException());
647-
wrappedListener.proceedWithClose();
656+
} else {
657+
internalOnError(Status.UNAVAILABLE
658+
.withDescription("External processor stream completed without drain")
659+
.asRuntimeException());
648660
}
649-
return;
650-
}
651-
652-
if (markExtProcStreamCompleted(extProcStreamState)) {
653-
handleFailOpen(wrappedListener);
654661
}
655662
}
656663
});
@@ -894,7 +901,6 @@ public void sendMessage(InputStream message) {
894901
.setEndOfStream(false)
895902
.build())
896903
.build());
897-
requestBodySentToExtProc.set(true);
898904
bodyMessageSentToExtProc.set(true);
899905

900906
if (config.getObservabilityMode()) {
@@ -964,12 +970,12 @@ public void halfClose() {
964970
}
965971

966972
// Mode is GRPC
973+
requestEosSent.set(true);
967974
sendToExtProc(ProcessingRequest.newBuilder()
968975
.setRequestBody(HttpBody.newBuilder()
969976
.setEndOfStreamWithoutMessage(true)
970977
.build())
971978
.build());
972-
requestEosSent.set(true);
973979
}
974980
}
975981

@@ -993,6 +999,13 @@ public void cancel(@Nullable String message, @Nullable Throwable cause) {
993999
cancelDownstream(message, cause);
9941000
}
9951001

1002+
private static boolean isDrainComplete(BodyResponse bodyResponse) {
1003+
return bodyResponse.hasResponse()
1004+
&& bodyResponse.getResponse().hasBodyMutation()
1005+
&& bodyResponse.getResponse().getBodyMutation().hasStreamedResponse()
1006+
&& bodyResponse.getResponse().getBodyMutation().getStreamedResponse().getDrainComplete();
1007+
}
1008+
9961009
private void handleRequestBodyResponse(BodyResponse bodyResponse) {
9971010
if (bodyResponse.hasResponse() && bodyResponse.getResponse().hasBodyMutation()) {
9981011
BodyMutation mutation = bodyResponse.getResponse().getBodyMutation();
@@ -1271,7 +1284,6 @@ public void onMessage(InputStream message) {
12711284
try {
12721285
ByteString bodyByteString = ByteString.readFrom(message);
12731286
sendResponseBodyToExtProc(bodyByteString, false);
1274-
dataPlaneClientCall.responseBodySentToExtProc.set(true);
12751287
dataPlaneClientCall.bodyMessageSentToExtProc.set(true);
12761288

12771289
if (dataPlaneClientCall.getConfig().getObservabilityMode()) {
@@ -1452,6 +1464,7 @@ private void triggerCloseHandshake() {
14521464

14531465
if (trailersOnly.get()) {
14541466
if (sendResponseHeaders) {
1467+
dataPlaneClientCall.responseTrailersSent.set(true);
14551468
dataPlaneClientCall.sendToExtProc(ProcessingRequest.newBuilder()
14561469
.setResponseHeaders(HttpHeaders.newBuilder()
14571470
.setHeaders(
@@ -1461,12 +1474,12 @@ private void triggerCloseHandshake() {
14611474
.setEndOfStream(true)
14621475
.build())
14631476
.build());
1464-
dataPlaneClientCall.responseTrailersSent.set(true);
14651477
} else {
14661478
closeNow = true;
14671479
}
14681480
} else if (sendResponseTrailers) {
14691481
dataPlaneClientCall.getIsProcessingTrailers().set(true);
1482+
dataPlaneClientCall.responseTrailersSent.set(true);
14701483
dataPlaneClientCall.sendToExtProc(ProcessingRequest.newBuilder()
14711484
.setResponseTrailers(HttpTrailers.newBuilder()
14721485
.setTrailers(
@@ -1475,7 +1488,6 @@ private void triggerCloseHandshake() {
14751488
dataPlaneClientCall.getConfig().getForwardRulesConfig()))
14761489
.build())
14771490
.build());
1478-
dataPlaneClientCall.responseTrailersSent.set(true);
14791491
} else {
14801492
closeNow = true;
14811493
}

0 commit comments

Comments
 (0)