Skip to content

Commit 4a63430

Browse files
committed
Merge branch 'ext-proc-draining-skip-queueing-or-saving-headers-when-send-mode-is-off' into ext-proc-client-flow-control
# Conflicts: # xds/src/test/java/io/grpc/xds/ExternalProcessorClientInterceptorTest.java
2 parents 4e01052 + 7c6740f commit 4a63430

2 files changed

Lines changed: 505 additions & 18 deletions

File tree

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

Lines changed: 33 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -899,6 +899,11 @@ public void request(int numMessages) {
899899
super.request(numMessages);
900900
return;
901901
}
902+
if (!config.getObservabilityMode()
903+
&& currentProcessingMode.getResponseBodyMode() != ProcessingMode.BodySendMode.GRPC) {
904+
super.request(numMessages);
905+
return;
906+
}
902907
if (!isSidecarReady()) {
903908
pendingRequests.addAndGet(numMessages);
904909
return;
@@ -934,6 +939,10 @@ public void sendMessage(InputStream message) {
934939

935940
ExtProcStreamState state = extProcStreamState.get();
936941
if (state.isDraining() || state.isCompleted()) {
942+
if (currentProcessingMode.getRequestBodyMode() == ProcessingMode.BodySendMode.NONE) {
943+
super.sendMessage(message);
944+
return;
945+
}
937946
try {
938947
ByteString copiedBody = ByteString.readFrom(message);
939948
pendingDrainingMessages.add(new KnownLengthInputStream(copiedBody));
@@ -1294,16 +1303,17 @@ public void onReady() {
12941303
public void onHeaders(Metadata headers) {
12951304
dataPlaneClientCall.setServerHeadersStartNanos(System.nanoTime());
12961305
responseHeadersSent.set(true);
1297-
if (dataPlaneClientCall.getExtProcStreamState().get().isDraining()) {
1298-
this.savedHeaders = headers;
1299-
return;
1300-
}
13011306
boolean sendResponseHeaders =
13021307
dataPlaneClientCall.getCurrentProcessingMode().getResponseHeaderMode()
13031308
== ProcessingMode.HeaderSendMode.SEND
13041309
|| dataPlaneClientCall.getCurrentProcessingMode().getResponseHeaderMode()
13051310
== ProcessingMode.HeaderSendMode.DEFAULT;
13061311

1312+
if (dataPlaneClientCall.getExtProcStreamState().get().isDraining() && sendResponseHeaders) {
1313+
this.savedHeaders = headers;
1314+
return;
1315+
}
1316+
13071317
if (dataPlaneClientCall.getPassThroughMode().get()
13081318
|| dataPlaneClientCall.getExtProcStreamState().get().isCompleted()
13091319
|| !sendResponseHeaders) {
@@ -1332,8 +1342,11 @@ public void onMessage(InputStream message) {
13321342
return;
13331343
}
13341344

1335-
if (savedHeaders != null
1336-
|| dataPlaneClientCall.getExtProcStreamState().get().isDraining()) {
1345+
boolean checkDrain = dataPlaneClientCall.getExtProcStreamState().get().isDraining()
1346+
&& dataPlaneClientCall.getCurrentProcessingMode().getResponseBodyMode()
1347+
== ProcessingMode.BodySendMode.GRPC;
1348+
1349+
if (savedHeaders != null || checkDrain) {
13371350
try {
13381351
ByteString copiedBody = ByteString.readFrom(message);
13391352
savedMessages.add(new KnownLengthInputStream(copiedBody));
@@ -1432,7 +1445,11 @@ public void onClose(Status status, Metadata trailers) {
14321445
return;
14331446
}
14341447

1435-
if (dataPlaneClientCall.getExtProcStreamState().get().isDraining()) {
1448+
boolean sendResponseTrailers =
1449+
dataPlaneClientCall.getCurrentProcessingMode().getResponseTrailerMode()
1450+
== ProcessingMode.HeaderSendMode.SEND;
1451+
1452+
if (dataPlaneClientCall.getExtProcStreamState().get().isDraining() && sendResponseTrailers) {
14361453
return;
14371454
}
14381455

@@ -1441,15 +1458,6 @@ public void onClose(Status status, Metadata trailers) {
14411458
}
14421459

14431460
triggerCloseHandshake();
1444-
1445-
if (dataPlaneClientCall.getConfig().getObservabilityMode()) {
1446-
proceedWithClose();
1447-
@SuppressWarnings("unused")
1448-
ScheduledFuture<?> unused = dataPlaneClientCall.getScheduler().schedule(
1449-
dataPlaneClientCall::closeExtProcStream,
1450-
dataPlaneClientCall.getConfig().getDeferredCloseTimeoutNanos(),
1451-
TimeUnit.NANOSECONDS);
1452-
}
14531461
}
14541462

14551463
void onReadyNotify() {
@@ -1578,6 +1586,15 @@ private void triggerCloseHandshake() {
15781586
dataPlaneClientCall.closeExtProcStream();
15791587
}
15801588
}
1589+
1590+
if (dataPlaneClientCall.getConfig().getObservabilityMode()) {
1591+
proceedWithClose();
1592+
@SuppressWarnings("unused")
1593+
ScheduledFuture<?> unused = dataPlaneClientCall.getScheduler().schedule(
1594+
dataPlaneClientCall::closeExtProcStream,
1595+
dataPlaneClientCall.getConfig().getDeferredCloseTimeoutNanos(),
1596+
TimeUnit.NANOSECONDS);
1597+
}
15811598
}
15821599

15831600
private void sendResponseBodyToExtProc(

0 commit comments

Comments
 (0)