Skip to content

xds: Fix ext_proc client hang on unary and server-streaming RPCs when upstream is not ready #13147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kannanjgithub wants to merge 1 commit into
base: master
Choose a base branch
from
Open

xds: Fix ext_proc client hang on unary and server-streaming RPCs when upstream is not ready #13147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions xds/src/main/java/io/grpc/xds/ExternalProcessorClientInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -934,6 +934,10 @@ boolean isSidecarReady() {
return observer != null && observer.isReady();
}

private boolean isUpstreamReady() {
return method.getType().clientSendsOneMessage() || super.isReady();
}

@Override
public boolean isReady() {
if (passThroughMode.get()) {
Expand Down Expand Up @@ -1193,7 +1197,7 @@ private void handleRequestBodyResponse(BodyResponse bodyResponse) {
boolean sendImmediately = false;
synchronized (streamLock) {
sidestreamToUpstreamWindow -= body.size();
if (pendingUpstreamBodyMessages.isEmpty() && super.isReady()) {
if (pendingUpstreamBodyMessages.isEmpty() && isUpstreamReady()) {
sendImmediately = true;
accumulatedWindowUpdateSidestreamToUpstream += body.size();
} else {
Expand Down Expand Up @@ -1307,7 +1311,7 @@ void drainPendingUpstreamBodyMessages() {
ByteString body = null;
boolean triggerHalfClose = false;
synchronized (streamLock) {
if (!pendingUpstreamBodyMessages.isEmpty() && super.isReady()) {
if (!pendingUpstreamBodyMessages.isEmpty() && isUpstreamReady()) {
body = pendingUpstreamBodyMessages.poll();
accumulatedWindowUpdateSidestreamToUpstream += body.size();
if (pendingUpstreamBodyMessages.isEmpty()
Expand Down Expand Up @@ -1366,16 +1370,16 @@ private void drainPendingDrainingMessages() {
boolean triggerHalfClose = false;

synchronized (streamLock) {
if (!pendingUpstreamBodyMessages.isEmpty() && super.isReady()) {
if (!pendingUpstreamBodyMessages.isEmpty() && isUpstreamReady()) {
msg = pendingUpstreamBodyMessages.poll();
isMutated = true;
} else if (pendingUpstreamBodyMessages.isEmpty()
&& !pendingRequestBodyMessages.isEmpty() && super.isReady()) {
&& !pendingRequestBodyMessages.isEmpty() && isUpstreamReady()) {
msg = pendingRequestBodyMessages.poll();
isMutated = true;
} else if (pendingUpstreamBodyMessages.isEmpty()
&& pendingRequestBodyMessages.isEmpty()
&& !pendingDrainingMessages.isEmpty() && super.isReady()) {
&& !pendingDrainingMessages.isEmpty() && isUpstreamReady()) {
msg = pendingDrainingMessages.poll();
isMutated = false;
}
Expand Down
Loading
Loading