◐ Shell
reader mode source ↗
Skip to content

gh-109370: Fix unexpected traceback output in test_concurrent_futures#109780

Merged
serhiy-storchaka merged 1 commit into
python:mainfrom
serhiy-storchaka:gh-109370
Sep 26, 2023
Merged

gh-109370: Fix unexpected traceback output in test_concurrent_futures#109780
serhiy-storchaka merged 1 commit into
python:mainfrom
serhiy-storchaka:gh-109370

Conversation

@serhiy-storchaka

@serhiy-storchaka serhiy-storchaka commented Sep 23, 2023 •
edited by bedevere-app Bot
Loading

Copy link
Copy Markdown
Member

Follow-up of gh-107219.

  • Only close the connection writer on Windows.
  • Also use existing constant _winapi.ERROR_OPERATION_ABORTED instead of WSA_OPERATION_ABORTED.

@serhiy-storchaka
pythongh-109370: Fix unexpected traceback output in test_concurrent_f… …
3030774 
…utures

Follow-up of pythongh-107219.

* Only close the connection writer on Windows.
* Also use existing constant _winapi.ERROR_OPERATION_ABORTED instead of
  WSA_OPERATION_ABORTED.
@serhiy-storchaka serhiy-storchaka added type-bug An unexpected behavior, bug, or error skip news needs backport to 3.11 only security fixes needs backport to 3.12 only security fixes labels Sep 23, 2023
@bedevere-app bedevere-app Bot mentioned this pull request Sep 23, 2023
Closed
@serhiy-storchaka serhiy-storchaka mentioned this pull request Sep 23, 2023
Closed
vstinner
vstinner approved these changes Sep 26, 2023
View reviewed changes

@vstinner vstinner left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hide comment

LGTM.

Honestly, I don't understand well this code. Apparently, there are multiple known issues. There is no simple fix. This change restores the code to the previous "status quo" and keep my fix for the other issue. It sounds like an acceptable tradeoff.

Thanks for reusing ERROR_OPERATION_ABORTED macro, I dislike hardcoded constants :-)

@serhiy-storchaka serhiy-storchaka merged commit 0b4e090 into python:main Sep 26, 2023
@miss-islington

miss-islington commented Sep 26, 2023

Copy link
Copy Markdown
Contributor

Thanks @serhiy-storchaka for the PR 🌮🎉.. I'm working now to backport this PR to: 3.11, 3.12.
🐍🍒⛏🤖

@serhiy-storchaka serhiy-storchaka deleted the gh-109370 branch September 26, 2023 07:06
@miss-islington

miss-islington commented Sep 26, 2023

Copy link
Copy Markdown
Contributor

Sorry, @serhiy-storchaka, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 0b4e090422db5f959184353d53552d1675f74212 3.12

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Sep 26, 2023
@serhiy-storchaka @miss-islington
pythongh-109370: Fix unexpected traceback output in test_concurrent_f… …
4e08e35 
…utures (pythonGH-109780)

Follow-up of pythongh-107219.

* Only close the connection writer on Windows.
* Also use existing constant _winapi.ERROR_OPERATION_ABORTED instead of
  WSA_OPERATION_ABORTED.
(cherry picked from commit 0b4e090)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
@bedevere-app

bedevere-app Bot commented Sep 26, 2023

Copy link
Copy Markdown

GH-109882 is a backport of this pull request to the 3.11 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.11 only security fixes label Sep 26, 2023
serhiy-storchaka added a commit that referenced this pull request Sep 26, 2023
@miss-islington @serhiy-storchaka
[3.11] gh-109370: Fix unexpected traceback output in test_concurrent_… …
8fef834 
…futures (GH-109780) (GH-109882)

Follow-up of gh-107219.

* Only close the connection writer on Windows.
* Also use existing constant _winapi.ERROR_OPERATION_ABORTED instead of
  WSA_OPERATION_ABORTED.
(cherry picked from commit 0b4e090)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
csm10495 pushed a commit to csm10495/cpython that referenced this pull request Sep 28, 2023
@serhiy-storchaka @csm10495
pythongh-109370: Fix unexpected traceback output in test_concurrent_f… …
4ddd6fa 
…utures (pythonGH-109780)

Follow-up of pythongh-107219.

* Only close the connection writer on Windows.
* Also use existing constant _winapi.ERROR_OPERATION_ABORTED instead of
  WSA_OPERATION_ABORTED.
@hugovk

hugovk commented Nov 9, 2023

Copy link
Copy Markdown
Member

Sorry, @serhiy-storchaka, I could not cleanly backport this to 3.12 due to a conflict. Please backport using cherry_picker on command line. cherry_picker 0b4e090422db5f959184353d53552d1675f74212 3.12

@serhiy-storchaka This fix has been merged to main and 3.11, please could you also do 3.12?

serhiy-storchaka added a commit to serhiy-storchaka/cpython that referenced this pull request Nov 10, 2023
@serhiy-storchaka
[3.12] pythongh-109370: Fix unexpected traceback output in test_concu… …
7d01d51 
…rrent_futures (pythonGH-109780)

Follow-up of pythongh-107219.

* Only close the connection writer on Windows.
* Also use existing constant _winapi.ERROR_OPERATION_ABORTED instead of
  WSA_OPERATION_ABORTED.
(cherry picked from commit 0b4e090)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
@bedevere-app

bedevere-app Bot commented Nov 10, 2023

Copy link
Copy Markdown

GH-111934 is a backport of this pull request to the 3.12 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.12 only security fixes label Nov 10, 2023
serhiy-storchaka added a commit that referenced this pull request Nov 10, 2023
@serhiy-storchaka
[3.12] gh-109370: Fix unexpected traceback output in test_concurrent_… …
4018209 
…futures (GH-109780) (GH-111934)

Follow-up of gh-107219.

* Only close the connection writer on Windows.
* Also use existing constant _winapi.ERROR_OPERATION_ABORTED instead of
  WSA_OPERATION_ABORTED.
(cherry picked from commit 0b4e090)
@serhiy-storchaka

serhiy-storchaka commented Nov 10, 2023

Copy link
Copy Markdown
Member Author

Thank you for your reminder @hugovk.

Glyphack pushed a commit to Glyphack/cpython that referenced this pull request Sep 2, 2024
@serhiy-storchaka @Glyphack
pythongh-109370: Fix unexpected traceback output in test_concurrent_f… …
25b6222 
…utures (pythonGH-109780)

Follow-up of pythongh-107219.

* Only close the connection writer on Windows.
* Also use existing constant _winapi.ERROR_OPERATION_ABORTED instead of
  WSA_OPERATION_ABORTED.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vstinner vstinner vstinner approved these changes

Assignees

@serhiy-storchaka serhiy-storchaka

Labels

skip news type-bug An unexpected behavior, bug, or error

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@serhiy-storchaka @miss-islington @hugovk @vstinner