Repository navigation
[3.11] gh-126500: test_ssl: Don't stop ThreadedEchoServer on OSError in ConnectionHandler; rely on __exit__ (GH-126503) (GH-126572) - #133148
Conversation
Sorry, something went wrong.
…Error in ConnectionHandler; rely on __exit__ (pythonGH-126503) (pythonGH-126572) pythongh-126500: test_ssl: Don't stop ThreadedEchoServer on OSError in ConnectionHandler; rely on __exit__ (pythonGH-126503) If `read()` in the ConnectionHandler thread raises `OSError` (except `ConnectionError`), the ConnectionHandler shuts down the entire ThreadedEchoServer, preventing further connections. It also does that for `EPROTOTYPE` in `wrap_conn`. As far as I can see, this is done to avoid the server thread getting stuck, forgotten, in its accept loop. However, since 2011 (5b95eb9) the server is used as a context manager, and its `__exit__` does `stop()` and `join()`. (I'm not sure if we *always* used `with` since that commit, but currently we do.) Make sure that the context manager *is* used, and remove the `server.stop()` calls from ConnectionHandler. (cherry picked from commit c9cda16) (cherry picked from commit aee80cd) Co-authored-by: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Co-authored-by: Petr Viktorin <encukou@gmail.com>
|
🤖 New build scheduled with the buildbot fleet by @encukou for commit 683380e 🤖 Results will be shown at: https://buildbot.python.org/all/#/grid?branch=refs%2Fpull%2F133148%2Fmerge If you want to schedule another build, you need to add the 🔨 test-with-buildbots label again. |
Sorry, something went wrong.
|
The failing buildbots aren't meant for 3.11 or have other preexisting issues. |
Sorry, something went wrong.
|
@pablogsal This test-only change should fix 3 of the 5 failing 3.11 stable buildbots. (Asan & FIPS will remain.) |
Sorry, something went wrong.
|
@encukou will you be doing the 3.10 backport, too? |
Sorry, something went wrong.
|
Yes. (#134030, but wait till buildbot results come in & I take a look at them) |
Sorry, something went wrong.
gh-126500: test_ssl: Don't stop ThreadedEchoServer on OSError in ConnectionHandler; rely on exit (GH-126503)
If read() in the ConnectionHandler thread raises OSError (except ConnectionError),
the ConnectionHandler shuts down the entire ThreadedEchoServer,
preventing further connections.
It also does that for EPROTOTYPE in wrap_conn.
As far as I can see, this is done to avoid the server thread getting stuck,
forgotten, in its accept loop. However, since 2011 (5b95eb9)
the server is used as a context manager, and its __exit__ does stop() and join().
(I'm not sure if we always used with since that commit, but currently we do.)
Make sure that the context manager is used, and remove the server.stop()
calls from ConnectionHandler.
(cherry picked from commit c9cda16)
(cherry picked from commit aee80cd)
Co-authored-by: Miss Islington (bot) 31488909+miss-islington@users.noreply.github.com
Co-authored-by: Petr Viktorin encukou@gmail.com
#126500