Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bpo-46364: Use sockets only for stdin of asyncio on AIX #30596

Merged
merged 2 commits into from
Oct 13, 2022
Merged

bpo-46364: Use sockets only for stdin of asyncio on AIX #30596

merged 2 commits into from
Oct 13, 2022
+24 −4

Conversation

xopham
Copy link
Contributor

@xopham xopham commented Jan 14, 2022 •
edited
Loading

The use of sockets for stdin of asyncio is restricted to AIX platform only to support reading from /dev/stdin using ascynio.create_subprocess_exec and asycio.create_subprocess_shell.

https://bugs.python.org/issue46364

@the-knights-who-say-ni
Copy link

Hello, and thanks for your contribution!

I'm a bot set up to make sure that the project can legally accept this contribution by verifying everyone involved has signed the PSF contributor agreement (CLA).

CLA Missing

Our records indicate the following people have not signed the CLA:

@xopham

For legal reasons we need all the people listed to sign the CLA before we can look at your contribution. Please follow the steps outlined in the CPython devguide to rectify this issue.

If you have recently signed the CLA, please wait at least one business day
before our records are updated.

You can check yourself to see if the CLA has been received.

Thanks again for the contribution, we look forward to reviewing it!

@xopham
Copy link
Contributor Author

xopham commented Jan 14, 2022

@asvetlov I am uncertain how to test this. Would you be able to point me in the right direction (code and test idea)?

@xopham xopham force-pushed the fix-issue-46364 branch 2 times, most recently from ca4e918 to 3afa104 Compare January 14, 2022 13:00
@xopham xopham marked this pull request as ready for review January 14, 2022 14:45
@xopham xopham requested review from 1st1 and asvetlov as code owners January 14, 2022 14:45
@asvetlov
Copy link
Contributor

asvetlov commented Feb 2, 2022

It could be an async subprocess that reads 16 bytes of data from stdin and writes them back to stdout.
Use /dev/zero to don't interact with the real terminal in tests.
Check the returned data, should be 16 zeroes.
Skip the test on AIX.

The test may use unittest.IsolatedAsyncioTestCase and asyncio.create_subprocess_exec, streaming API is easier to use than protocol-based.
An example of IsolatedAsyncioTestCase is here: https://github.com/python/cpython/blob/main/Lib/test/test_asyncio/test_locks.py
tearDownModule is crucial for CPython self-test runner.

@xopham xopham mannequin mentioned this pull request Apr 10, 2022
Closed
@tifv
Copy link
Contributor

tifv commented Jul 18, 2022

I have written some kind of test: tifv@6477c7e
On my Linux system it fails; until you add the changes in this pull request and then it succeeds.

Notes

  1. I have conditioned the test to run on Linux only because I have little idea of what platforms are supposed to have /dev/stdin.
  2. I didn't understand @asvetlov's suggestions about /dev/zero. Some existing tests in test_subprocess.py looked like a perfect fit instead, so I have copied and edited one of them.

@xopham
Copy link
Contributor Author

xopham commented Jul 29, 2022

@tifv I also tried around with the /dev/zero idea, but that does not create the reported error when reading from /dev/stdin does. Thanks for sharing the tests here 🙏 they seem good to me. Would be happy to join this and move forward. Has been at the back of my head for long enough 😉
@asvetlov can we merge the two separately or will they have to become one pull request? Happy for any input.

@xopham
Copy link
Contributor Author

xopham commented Aug 12, 2022

@tifv I have cherry-picked your commit.

@asvetlov I think this PR is complete and ready for review/merging.

@xopham
Copy link
Contributor Author

xopham commented Aug 12, 2022

@1st1 any feedback on this?

kumaraditya303
kumaraditya303 approved these changes Oct 13, 2022
View reviewed changes
Copy link
Contributor

@kumaraditya303 kumaraditya303 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

LGTM I'll schedule a buildbot run after you have fixed the news entry.

Misc/NEWS.d/next/Library/2022-01-14-10-49-20.bpo-46364.SzhlU9.rst Outdated Show resolved Hide resolved
@kumaraditya303 kumaraditya303 added the type-bug An unexpected behavior, bug, or error label Oct 13, 2022
xopham and others added 2 commits October 13, 2022 13:35
@xopham
bpo-46364: only use socket for stdin on AIX
a0a38c1 
Signed-off-by: Christoph Hamsen <hamsen.christoph@posteo.de>
@tifv @xopham
pythongh-90522: add test
0ac3aed 
Subprocess opening /dev/stdin fails if it is a socketpair.
@xopham xopham requested a review from gvanrossum as a code owner October 13, 2022 11:35
@xopham
Copy link
Contributor Author

xopham commented Oct 13, 2022

@kumaraditya303 fixed the news entry as requested. Let me know if anything else is needed.

@kumaraditya303 kumaraditya303 added the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Oct 13, 2022
@bedevere-bot
Copy link

🤖 New build scheduled with the buildbot fleet by @kumaraditya303 for commit 0ac3aed 🤖

If you want to schedule another build, you need to add the ":hammer: test-with-buildbots" label again.

@bedevere-bot bedevere-bot removed the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Oct 13, 2022
gvanrossum
gvanrossum approved these changes Oct 13, 2022
View reviewed changes
Copy link
Member

@gvanrossum gvanrossum left a comment

Choose a reason for hiding this comment

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

Seems okay.

@gvanrossum gvanrossum merged commit c9ed032 into python:main Oct 13, 2022
@miss-islington
Copy link
Contributor

Thanks @xopham for the PR, and @gvanrossum for merging it 🌮🎉.. I'm working now to backport this PR to: 3.10, 3.11.
🐍🍒⛏🤖

@bedevere-bot
Copy link

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

@bedevere-bot bedevere-bot removed the needs backport to 3.11 only security fixes label Oct 13, 2022
@bedevere-bot
Copy link

GH-98244 is a backport of this pull request to the 3.10 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label Oct 13, 2022
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 13, 2022
@xopham @miss-islington
bpo-46364: Use sockets for stdin of asyncio only on AIX (pythonGH-30596)
c482e9a 
Signed-off-by: Christoph Hamsen <hamsen.christoph@posteo.de>
Co-authored-by: July Tikhonov <july.tikh@gmail.com>
(cherry picked from commit c9ed032)

Co-authored-by: Christoph Hamsen <37963496+xopham@users.noreply.github.com>
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 13, 2022
@xopham @miss-islington
bpo-46364: Use sockets for stdin of asyncio only on AIX (pythonGH-30596)
1b9eb4d 
Signed-off-by: Christoph Hamsen <hamsen.christoph@posteo.de>
Co-authored-by: July Tikhonov <july.tikh@gmail.com>
(cherry picked from commit c9ed032)

Co-authored-by: Christoph Hamsen <37963496+xopham@users.noreply.github.com>
miss-islington added a commit that referenced this pull request Oct 13, 2022
@miss-islington @xopham
bpo-46364: Use sockets for stdin of asyncio only on AIX (GH-30596)
fa9f65e 
Signed-off-by: Christoph Hamsen <hamsen.christoph@posteo.de>
Co-authored-by: July Tikhonov <july.tikh@gmail.com>
(cherry picked from commit c9ed032)

Co-authored-by: Christoph Hamsen <37963496+xopham@users.noreply.github.com>
miss-islington added a commit that referenced this pull request Oct 13, 2022
@miss-islington @xopham
bpo-46364: Use sockets for stdin of asyncio only on AIX (GH-30596)
595ef03 
Signed-off-by: Christoph Hamsen <hamsen.christoph@posteo.de>
Co-authored-by: July Tikhonov <july.tikh@gmail.com>
(cherry picked from commit c9ed032)

Co-authored-by: Christoph Hamsen <37963496+xopham@users.noreply.github.com>
carljm added a commit to carljm/cpython that referenced this pull request Oct 14, 2022
@carljm
Merge branch 'main' into typewatch
6e53514 
* main: (38 commits)
  pythongh-98251: Allow venv to pass along PYTHON* variables to pip and ensurepip when they do not impact path resolution (pythonGH-98259)
  Bpo-41246: IOCP Proactor avoid callback code duplication (python#21399)
  bpo-46364: Use sockets for stdin of asyncio only on AIX (python#30596)
  pythongh-98178: syslog() is not thread-safe on macOS (python#98213)
  Mark all targets in `Doc/Makefile` as `PHONY` (pythonGH-98189)
  pythongh-97982: Factorize PyUnicode_Count() and unicode_count() code (python#98025)
  pythongh-96265: Formatting changes for faq/general (python#98129)
  tutorial: remove "with single quotes" (python#98204)
  pythongh-97669: Remove Tools/scripts/startuptime.py (python#98214)
  signalmodule.c uses _PyErr_WriteUnraisableMsg() (python#98217)
  pythongh-97669: Fix test_tools reference leak (python#98216)
  pythongh-97669: Create Tools/patchcheck/ directory (python#98186)
  pythongh-65046: Link to logging cookbook from asyncio docs (python#98207)
  Formatting fixes in contextlib docs (python#98111)
  pythongh-95276: Add callable entry to the glossary (python#95738)
  pythongh-96130: Rephrase use of "typecheck" verb for clarity (python#98144)
  Fix some incorrect indentation around the main switch (python#98177)
  pythongh-98172: Fix formatting in `except*` docs (python#98173)
  pythongh-97982: Remove asciilib_count() (python#98164)
  pythongh-95756: Free and NULL-out code caches when needed (pythonGH-98181)
  ...
carljm added a commit to carljm/cpython that referenced this pull request Oct 14, 2022
@carljm
Merge branch 'main' into cached_property
0bb0c69 
* main: (37 commits)
  pythongh-98251: Allow venv to pass along PYTHON* variables to pip and ensurepip when they do not impact path resolution (pythonGH-98259)
  Bpo-41246: IOCP Proactor avoid callback code duplication (python#21399)
  bpo-46364: Use sockets for stdin of asyncio only on AIX (python#30596)
  pythongh-98178: syslog() is not thread-safe on macOS (python#98213)
  Mark all targets in `Doc/Makefile` as `PHONY` (pythonGH-98189)
  pythongh-97982: Factorize PyUnicode_Count() and unicode_count() code (python#98025)
  pythongh-96265: Formatting changes for faq/general (python#98129)
  tutorial: remove "with single quotes" (python#98204)
  pythongh-97669: Remove Tools/scripts/startuptime.py (python#98214)
  signalmodule.c uses _PyErr_WriteUnraisableMsg() (python#98217)
  pythongh-97669: Fix test_tools reference leak (python#98216)
  pythongh-97669: Create Tools/patchcheck/ directory (python#98186)
  pythongh-65046: Link to logging cookbook from asyncio docs (python#98207)
  Formatting fixes in contextlib docs (python#98111)
  pythongh-95276: Add callable entry to the glossary (python#95738)
  pythongh-96130: Rephrase use of "typecheck" verb for clarity (python#98144)
  Fix some incorrect indentation around the main switch (python#98177)
  pythongh-98172: Fix formatting in `except*` docs (python#98173)
  pythongh-97982: Remove asciilib_count() (python#98164)
  pythongh-95756: Free and NULL-out code caches when needed (pythonGH-98181)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gvanrossum gvanrossum gvanrossum approved these changes

@kumaraditya303 kumaraditya303 kumaraditya303 approved these changes

@1st1 1st1 Awaiting requested review from 1st1 1st1 is a code owner

@asvetlov asvetlov Awaiting requested review from asvetlov asvetlov is a code owner

Assignees
No one assigned
Labels
topic-asyncio type-bug An unexpected behavior, bug, or error
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@xopham @the-knights-who-say-ni @asvetlov @tifv @bedevere-bot @miss-islington @gvanrossum @kumaraditya303 @ezio-melotti