Fixes #220 sslproto memory issue #222
Merged
Conversation
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
1st1
reviewed
Jan 31, 2019
fantix
force-pushed
the
t220-ssl-memory-leak
branch
from
9d93438 to
57c62af
Compare
fantix
force-pushed
the
t220-ssl-memory-leak
branch
from
57c62af to
e6406b4
Compare
|
OK if tests pass I think this PR is good enough now, please kindly review. |
Looks like it's red :( |
fantix
force-pushed
the
t220-ssl-memory-leak
branch
from
e6406b4 to
e2bba47
Compare
|
Oh I'm stupid, has been investigating why Okay found the same (part of) bug in asyncio, skipping the test for now, I'll create another PR to fix in asyncio. (So the bug is, the handshake timeout handle is never cancelled if the handshake was terminated early - an additional timeout for example. In this case, all objects in the reference chain including SSLProtocol, transport, SSLContext will remain in memory until the handle actually times out, thus it is some kind of a memory leak.) |
fantix
force-pushed
the
t220-ssl-memory-leak
branch
4 times, most recently
from
4197eb4 to
2f9ea1a
Compare
|
Yay! Green now. Also added a second test. Using Amir's script, it's like this before this fix:
And now after this fix:
|
There were two issues: 1) at `connection_lost()` the timeout handle was never cancelled because getting a cdef property on a cdef class with `getattr` always return `None`, and 2) for now cancelling a uvloop timeout handle only clears references to call arguments but not the callback object itself, therefore the closure is now a part of the arguments to avoid SSLProtocol object stays in memory until the cancelled timeout handle actually get deallocated.
fantix
force-pushed
the
t220-ssl-memory-leak
branch
from
2f9ea1a to
c3e8ce6
Compare
fantix
added a commit
to fantix/cpython
that referenced
this pull request
Mar 17, 2019
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Mar 17, 2019
* Fix handshake timeout leak in asyncio/sslproto Refs MagicStack/uvloopGH-222 * Break circular ref _SSLPipe <-> SSLProtocol * bpo-34745: Fix asyncio ssl memory leak * Break circular ref SSLProtocol <-> UserProtocol * Add NEWS entry (cherry picked from commit f683f46) Co-authored-by: Fantix King <fantix.king@gmail.com>
1st1
pushed a commit
to python/cpython
that referenced
this pull request
Mar 17, 2019
* Fix handshake timeout leak in asyncio/sslproto Refs MagicStack/uvloop#222 * Break circular ref _SSLPipe <-> SSLProtocol * bpo-34745: Fix asyncio ssl memory leak * Break circular ref SSLProtocol <-> UserProtocol * Add NEWS entry
miss-islington
added a commit
to python/cpython
that referenced
this pull request
Mar 17, 2019
* Fix handshake timeout leak in asyncio/sslproto Refs MagicStack/uvloopGH-222 * Break circular ref _SSLPipe <-> SSLProtocol * bpo-34745: Fix asyncio ssl memory leak * Break circular ref SSLProtocol <-> UserProtocol * Add NEWS entry (cherry picked from commit f683f46) Co-authored-by: Fantix King <fantix.king@gmail.com>
fantix
added a commit
to fantix/cpython
that referenced
this pull request
Mar 18, 2019
* Fix handshake timeout leak in asyncio/sslproto, refs MagicStack/uvloop#222 * Break circular ref _SSLPipe <-> SSLProtocol * bpo-34745: Fix asyncio ssl memory leak * Break circular ref SSLProtocol <-> UserProtocol * Add NEWS entry
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I think this could at least fix the issue that is reproducible with the given script in #220. In the meantime, I'm still looking for more corner cases that may lead to issues.
Tasks below shall be addressed in a new PR:
SSLTransportthat is never closed by orphaned AppProtocol (shared with asyncio?)