Skip to content

stub: remove interrupt checking from ThreadSafeThreadlessExecutor.drain (1.76.x backport) #12391

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

Closed
wants to merge 1 commit into from
Closed

stub: remove interrupt checking from ThreadSafeThreadlessExecutor.drain (1.76.x backport) #12391

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: 3 additions & 11 deletions stub/src/main/java/io/grpc/stub/BlockingClientCall.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ public void halfClose() {
*/
@VisibleForTesting
Status getClosedStatus() {
drainQuietly();
executor.drain();
CloseState state = closeState.get();
return (state == null) ? null : state.status;
}
Expand All @@ -295,7 +295,7 @@ boolean isEitherReadOrWriteReady() {
*/
@VisibleForTesting
boolean isReadReady() {
drainQuietly();
executor.drain();

return !buffer.isEmpty();
}
Expand All @@ -308,7 +308,7 @@ boolean isReadReady() {
*/
@VisibleForTesting
boolean isWriteReady() {
drainQuietly();
executor.drain();

return isWriteLegal() && call.isReady();
}
Expand All @@ -325,14 +325,6 @@ ClientCall.Listener<RespT> getListener() {
return new QueuingListener();
}

private void drainQuietly() {
try {
executor.drain();
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
}

private final class QueuingListener extends ClientCall.Listener<RespT> {
@Override
public void onMessage(RespT value) {
Expand Down
7 changes: 2 additions & 5 deletions stub/src/main/java/io/grpc/stub/ClientCalls.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -935,11 +935,8 @@ public <T> void waitAndDrainWithTimeout(boolean waitForever, long end,
}
}

/**
* Executes all queued Runnables and if there were any wakes up any waiting threads.
*/
public void drain() throws InterruptedException {
throwIfInterrupted();
/** Executes all queued Runnables and if there were any wakes up any waiting threads. */
void drain() {
Runnable runnable;
boolean didWork = false;

Expand Down