Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Close proxycommand socket when its not needed anymore and resolve ssh zombies #4881

Merged
merged 12 commits into from
Apr 6, 2020
Merged

Close proxycommand socket when its not needed anymore and resolve ssh zombies #4881

Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fff2f24
Close proxycommand socket when its not needed anymore
eedgar Mar 9, 2020
12612b3
Update st2common/st2common/runners/paramiko_ssh.py
punkrokk Apr 2, 2020
f3a6ea4
Merge branch 'master' into paramiko-789-workaround
punkrokk Apr 2, 2020
b187227
Update CHANGELOG referring to 4881
eedgar Apr 3, 2020
76236e5
use socket from the entry to _connect
eedgar Apr 3, 2020
ecf789d
Merge branch 'master' into paramiko-789-workaround
punkrokk Apr 3, 2020
3393409
add tests for paramiko socket closing
eedgar Apr 3, 2020
1e0d534
Merge branch 'master' into paramiko-789-workaround
eedgar Apr 3, 2020
bb2c988
Add todos for tests
eedgar Apr 3, 2020
cd3220b
move to bugs
eedgar Apr 3, 2020
c49f97a
remove unneeded test call
eedgar Apr 3, 2020
9bd10f7
Move the changes to the correct place in the changelog
eedgar Apr 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions st2common/st2common/runners/paramiko_ssh.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ def __init__(self, hostname, port=DEFAULT_SSH_PORT, username=None, password=None

self.bastion_client = None
self.bastion_socket = None
self.socket = None

def connect(self):
"""
Expand Down Expand Up @@ -455,6 +456,12 @@ def close(self):

self.client.close()

if self.socket:
self.logger.debug('Closing proxycommand socket connection')
# https://github.com/paramiko/paramiko/issues/789 Avoid zombie ssh processes
self.socket.process.kill()
self.socket.process.poll()

if self.sftp_client:
self.sftp_client.close()

Expand Down Expand Up @@ -698,8 +705,8 @@ def _connect(self, host, socket=None):
'_username': self.username, '_timeout': self.timeout}
self.logger.debug('Connecting to server', extra=extra)

socket = socket or ssh_config_file_info.get('sock', None)
if socket:
self.socket = self.socket or ssh_config_file_info.get('sock', None)
if self.socket:
conninfo['sock'] = socket

client = paramiko.SSHClient()
Expand Down