gh-149388: Make PipeHandle.close idempotent#149518
Open
mxschmitt wants to merge 1 commit intopython:mainfrom
Open
gh-149388: Make PipeHandle.close idempotent#149518mxschmitt wants to merge 1 commit intopython:mainfrom
mxschmitt wants to merge 1 commit intopython:mainfrom
Conversation
mxschmitt
requested review from
1st1,
asvetlov,
kumaraditya303 and
willingc
as code owners
|
All commit authors signed the Contributor License Agreement. |
Author
|
Closing to validate with a local CPython build before re-opening. |
Author
|
Validated locally against a built CPython 3.16.0a0 from this branch: new regression test transitions FAIL -> PASS, full |
Clear _handle before calling CloseHandle so a stale handle (closed by another code path) does not leak OSError into _ProactorBasePipeTransport._call_connection_lost.
mxschmitt
force-pushed
the
gh-149388-pipehandle-close-idempotent
branch
from
798a844 to
37904e4
Compare
| @@ -0,0 +1,7 @@ | |||
| Make :meth:`!asyncio.windows_utils.PipeHandle.close` idempotent by clearing | |||
Contributor
There was a problem hiding this comment.
no need to explain the internals, it can be simple as "make asyncio windows pipe closing idempotent"
| # subsequent close() are silent no-ops. | ||
| try: | ||
| p.close() | ||
| except OSError: |
Contributor
There was a problem hiding this comment.
does this still raises?
| if self._handle is not None: | ||
| CloseHandle(self._handle) | ||
| self._handle = None | ||
| handle, self._handle = self._handle, None |
Contributor
There was a problem hiding this comment.
I'd prefer to keep it on two lines, it makes reasoning about the order easier.
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
2 participants
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.
Fixes #149388. Applies @kumaraditya303's suggestion from the issue thread: clear
_handlebefore callingCloseHandle, so that whenCloseHandleraises on an already-closed handle,_handleis alreadyNoneand neither a secondclose()nor__del__re-raises.The new regression test in
test_windows_utils.PipeTestsfails onmain:and passes with the patch. Full
python -m test test_asynciois green on the patched build (2524 tests, 0 failures).The end-to-end repro from the issue (
repro_v2.py) goes from 6/20 → 0/60 trials firingWinError 6. Verified against a locally built CPython 3.16.0a0 (Windows x86_64) from this branch.