Skip to content

Commit 3b4b890

Browse files
committed
xds: remove outstandingResponseBodyRequests from ext_proc server interceptor
ext_proc ProcessingResponses do not have a 1-to-1 relationship with ProcessingRequests (messages can be inserted, dropped, or chunked). Remove outstandingResponseBodyRequests tracking and instead defer close only while messages are waiting in pendingResponseBodyMessages. TAG=agy CONV=581f86a6-097d-44a2-9d6e-6f9d2e83cbc0
1 parent 454d84f commit 3b4b890

2 files changed

Lines changed: 5 additions & 31 deletions

File tree

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

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,6 @@ static class DataPlaneServerCall
307307
@GuardedBy("streamLock")
308308
private final Queue<ByteString> pendingResponseBodyMessages = new ConcurrentLinkedQueue<>();
309309
@GuardedBy("streamLock")
310-
private int outstandingResponseBodyRequests = 0;
311-
@GuardedBy("streamLock")
312310
private final AtomicBoolean pendingClose = new AtomicBoolean(false);
313311

314312
// Path 4 flow control: Buffered mutated response bodies from ext_proc to send to
@@ -583,9 +581,6 @@ private void sendToExtProc(ProcessingRequest request) {
583581
} else if (requestToSend.hasResponseTrailers()) {
584582
expectedResponses.add(EventType.RESPONSE_TRAILERS);
585583
}
586-
if (requestToSend.hasResponseBody()) {
587-
outstandingResponseBodyRequests++;
588-
}
589584

590585
extProcClientCallRequestObserver.onNext(requestToSend);
591586
}
@@ -1035,9 +1030,7 @@ void proceedWithSendHeaders() {
10351030
Metadata trailersForHandshake = null;
10361031
synchronized (streamLock) {
10371032
if (savedStatus != null) {
1038-
if (!config.getObservabilityMode()
1039-
&& (!pendingResponseBodyMessages.isEmpty()
1040-
|| outstandingResponseBodyRequests > 0)) {
1033+
if (!config.getObservabilityMode() && !pendingResponseBodyMessages.isEmpty()) {
10411034
pendingClose.set(true);
10421035
} else {
10431036
triggerHandshake = true;
@@ -1145,8 +1138,7 @@ public void close(Status status, Metadata trailers) {
11451138
this.savedStatus = status;
11461139
this.savedTrailers = trailers;
11471140

1148-
if (!config.getObservabilityMode()
1149-
&& (!pendingResponseBodyMessages.isEmpty() || outstandingResponseBodyRequests > 0)) {
1141+
if (!config.getObservabilityMode() && !pendingResponseBodyMessages.isEmpty()) {
11501142
pendingClose.set(true);
11511143
return;
11521144
}
@@ -1324,9 +1316,7 @@ void drainPendingResponseBodyMessages() {
13241316
request = prepareResponseBodyRequest(body);
13251317
}
13261318
if (request == null) {
1327-
if (pendingResponseBodyMessages.isEmpty()
1328-
&& pendingClose.get()
1329-
&& outstandingResponseBodyRequests == 0) {
1319+
if (pendingResponseBodyMessages.isEmpty() && pendingClose.get()) {
13301320
triggerClose = true;
13311321
pendingClose.set(false);
13321322
}
@@ -1430,22 +1420,6 @@ private void handleResponseBodyResponse(BodyResponse bodyResponse) {
14301420
trySendAccumulatedWindowUpdates();
14311421
}
14321422
}
1433-
1434-
boolean triggerClose = false;
1435-
Metadata trailersForHandshake = null;
1436-
synchronized (streamLock) {
1437-
outstandingResponseBodyRequests--;
1438-
if (pendingClose.get()
1439-
&& pendingResponseBodyMessages.isEmpty()
1440-
&& outstandingResponseBodyRequests == 0) {
1441-
pendingClose.set(false);
1442-
triggerClose = true;
1443-
trailersForHandshake = savedTrailers;
1444-
}
1445-
}
1446-
if (triggerClose) {
1447-
triggerCloseHandshake(trailersForHandshake);
1448-
}
14491423
}
14501424

14511425
private void deliverResponseBodyToClient(ByteString body) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16940,8 +16940,8 @@ public void onClose(Status status, Metadata trailers) {
1694016940
assertThat(receivedRequests.get(1).hasResponseBody()).isTrue();
1694116941
assertThat(receivedRequests.get(1).getResponseBody().getBody())
1694216942
.isEqualTo(ByteString.copyFrom(smallMessageBytes));
16943-
assertThat(receivedRequests.get(2).hasClientWindowUpdate()).isTrue();
16944-
assertThat(receivedRequests.get(3).hasResponseTrailers()).isTrue();
16943+
assertThat(receivedRequests.get(2).hasResponseTrailers()).isTrue();
16944+
assertThat(receivedRequests.get(3).hasClientWindowUpdate()).isTrue();
1694516945

1694616946
assertThat(receivedMessages).hasSize(2);
1694716947
assertThat(receivedMessages.get(0)).isEqualTo(ByteString.copyFrom(largeMessageBytes));

0 commit comments

Comments
 (0)