Fix race conditions in TlsHandshakeTimeoutServer#824
Merged
rschmitt merged 1 commit intoapache:masterfrom Apr 23, 2026
Merged
Conversation
`close()` did not wait for the server thread to finish, so it could read stale state (`requestReceived`, `throwable`) while the thread was still running. This caused two intermittent failures: - "Never received a request": `close()` checked requestReceived before the server thread set it after accept() returned. - "Exception thrown while TlsHandshakeTimerOuter was running": the server thread got an expected IOException or BUFFER_UNDERFLOW when the client timed out and disconnected, and `close()` rethrew it. Fix: store the Thread reference and `join()` it in `close()` after closing the sockets. Remove the `requestReceived` and `throwable` checks since all server-side exceptions are expected (the client is designed to time out) and client-side assertions already validate correctness.
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.
close()did not wait for the server thread to finish, so it could read stale state (requestReceived,throwable) while the thread was still running. This caused two intermittent failures:close()checked requestReceived before the server thread set it after accept() returned.close()rethrew it.Fix: store the Thread reference and
join()it inclose()after closing the sockets. Remove therequestReceivedandthrowablechecks since all server-side exceptions are expected (the client is designed to time out) and client-side assertions already validate correctness.