Restore interrupt status in InterruptedException catch blocks - #13074
Open
TimurRakhmatullin86 wants to merge 1 commit into
Open
TimurRakhmatullin86 wants to merge 1 commit into
TimurRakhmatullin86 wants to merge 1 commit into
Conversation
Six files catch InterruptedException, wrap it in another exception, and re-throw without first calling Thread.currentThread().interrupt(). This silently clears the thread's interrupt flag, so callers checking Thread.isInterrupted() will miss that an interrupt occurred. The rest of the codebase (ClientCalls, NettyServer, OkHttpClientTransport, CsdsService, AsyncSecurityPolicy, etc.) already follows the correct pattern: restore the flag, then re-throw. These six are oversights. Files fixed: - TransmitStatusRuntimeExceptionInterceptor (4 catch blocks) - AltsHandshakerClient (3 catch blocks, split from multi-catch) - HandshakerServiceChannel (1 catch block in close()) - ChannelzProtoUtil (1 catch block) - XdsServerWrapper (1 catch block, split from multi-catch) - SslContextFactory (1 catch block, split from multi-catch)
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Six files catch
InterruptedException, wrap it in another exception, andre-throw without calling
Thread.currentThread().interrupt()first. Thissilently clears the thread's interrupt flag, preventing callers from detecting
that an interrupt occurred.
The rest of the codebase already follows the correct pattern (e.g.,
ClientCalls,NettyServer,OkHttpClientTransport,CsdsService,AsyncSecurityPolicy): restore the flag before re-throwing.Files fixed
TransmitStatusRuntimeExceptionInterceptorRuntimeExceptionwithout restoreAltsHandshakerClientIOException, wrapped inGeneralSecurityExceptionwithout restoreHandshakerServiceChannelclose()without flag restoreChannelzProtoUtilStatusRuntimeExceptionwithout restoreXdsServerWrapperExecutionException, wrapped inRuntimeExceptionwithout restoreSslContextFactoryIOException, wrapped inGeneralSecurityExceptionwithout restoreFor multi-catch blocks (
IOException | InterruptedException), the catch issplit so that
Thread.currentThread().interrupt()is called only forInterruptedException, not forIOException.Test plan
🤖 Generated with Claude Code