Skip to content

fix: close frameReader before socket in stopIfNecessary to prevent TSAN data race #12949

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
waterWang wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −2
Open

fix: close frameReader before socket in stopIfNecessary to prevent TSAN data race #12949

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
11 changes: 9 additions & 2 deletions okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1207,8 +1207,15 @@ private void stopIfNecessary() {
frameWriter.goAway(0, ErrorCode.NO_ERROR, new byte[0]);
}

// We will close the underlying socket in the writing thread to break out the reader
// thread, which will close the frameReader and notify the listener.
// Close the frameReader first to stop the ClientFrameHandler thread, then
// close the frameWriter (which closes the underlying socket through the
// writing thread). This prevents a TSAN data race between the socket close
// and the ClientFrameHandler's read from the same socket.
try {
clientFrameHandler.frameReader.close();
} catch (IOException e) {
log.log(java.util.logging.Level.FINE, "Exception closing frame reader", e);
}
frameWriter.close();
}

Expand Down
Loading