Cleanup socket on connection error/timeout #346
Conversation
This file contains 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
pkittenis
requested changes
Aug 5, 2022
| @@ -302,8 +302,12 @@ def _connect_socket(self, family, _type, proto, sock_addr, host, port, retries): | |||
| try: | |||
| self.sock.connect(sock_addr) | |||
| except ConnectionRefusedError: | |||
| self.sock.shutdown(socket.SHUT_RDWR) | |||
There was a problem hiding this comment.
Suggested change
| self.sock.shutdown(socket.SHUT_RDWR) | |
| if not self.sock.closed: | |
| self.sock.shutdown(socket.SHUT_RDWR) | |
| self.sock.close() |
Otherwise will get test failures for already closed sockets - see test failures. Might also want to split the above block to an internal function, since same thing is needed below.
| raise | ||
| except sock_error as ex: | ||
| self.sock.shutdown(socket.SHUT_RDWR) |
There was a problem hiding this comment.
Also needs a check that self.sock is not already closed - as above.
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.
When constructing a connection to a server, and the server is not responsive, the socket is not closed in a timely fashion and can cause a secondary exception when cleaning up in the exception handler due to the resource leak. This is
ConnectionError: ("Error connecting to host '%s:%s' - %s - retry %s/%s", 'kg-meter2', 22, 'timed out', 3, 3)
E
E During handling of the above exception, another exception occurred:
E
E Traceback (most recent call last):
E File "/home/kgodwin/.local/lib/python3.8/site-packages/_pytest/unraisableexception.py", line 43, in _hook
E self.unraisable = unraisable
E ResourceWarning: unclosed <socket object, fd=23, family=2, type=1, proto=0>