Socket not closing after server disconnect #1797
Merged
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.
Pull Request check-list
Please make sure to review and check all of these items:
$ tox
pass with this change (including linting)?NOTE: these things are not required to open a PR and can be done
afterwards / while the PR is open.
Description of change
This is based on @michael-lazar's recent work on fixing a Celery memory leak caused by py-amqp: celery/py-amqp#374
I recently learned that
socket.shutdown()
can throw anOSError
when the server caused the disconnection. I also learned thatsocket.shutdown
andsocket.close
have different purposes: https://stackoverflow.com/a/598759So, you still need to run
socket.close
aftersocket.shutdown
to allow garbage collection to deallocate the socket.Currently, redis-py's
Connection.disconnect()
won't continue to close the socket if it encounters anOSError
on shutdown. This prevents garbage collection from cleaning up the socket and will use more memory than necessary (maybe even causing a leak?).This PR puts a separate try/except around
socket.close
andsocket.shutdown
to allow the socket to be closed after a failed shutdown.