Fix proxycommand leaks#2019
Merged
Merged
Conversation
sphuber
approved these changes
Oct 4, 2018
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
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.
Fixes #2018 and fixes #1923 and fixes #1853
This addresses two issues:
_DetachedProxyCommandshould not callsuper. The reason for this is that the detached version creates a different subprocess. If thesuperis also called, two subprocesses are created.closemethod of_DetachedProxyCommand, the subprocess is killed more aggressively, and wepollthe subprocess to avoid having defunct processes.The subprocess killing is implemented as follows:
.terminate()the subprocess.poll()for 2 seconds to see if it exits.kill(), and.poll()again for 2 secondsThis part is a bit hand-wavy, but I wanted to avoid using the
.wait()method. On balance I think it's better if the daemon just continues if the subprocess is really unkillable.