Fix race in TCP publisher close() vs concurrent connect() (#69187)#69328
Open
dwoz wants to merge 2 commits into
Open
Fix race in TCP publisher close() vs concurrent connect() (#69187)#69328dwoz wants to merge 2 commits into
dwoz wants to merge 2 commits into
Conversation
dwoz
commented
Jun 7, 2026
dwoz
left a comment
dwoz
left a comment
Contributor
Author
There was a problem hiding this comment.
Please add a functional test that exercises this code path too.
Contributor
Author
|
Added functional test in tests/pytests/functional/transport/tcp/test_pub_server.py — drives publisher.connect()/close() through a real io_loop and bound TCP socket, only IOStream.connect is wrapped to deterministically park _connect() during the race. Fails on unfixed code with the exact AttributeError. |
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.
What does this PR do?
Guards
_connecting_future.set_result()/set_exception()against the future having been cleared by a concurrentclose().What issues does this PR fix or reference?
Fixes #69187
Previous Behavior
_TCPPubServerPublisher.close()setsself._connecting_future = None. If a concurrent_connect()coroutine was awaitingstream.connect(), the await resumes and calls.set_result(True)or.set_exception(e)onNone, raisingAttributeError: 'NoneType' object has no attribute 'set_result'.New Behavior
Both call sites guard with
if self._connecting_future is not None. The legacysalt.transport.ipc.IPCMessageClientin the original traceback was removed on master/3008.x; the same pattern persists in the replacement publisher, which this fixes.Merge requirements satisfied?
Commits signed with GPG?
Yes