openstack/manila
Code Issues Proposed changes

Merge "Change ssh_utils parameter to correctly send keepalive packets" into stable/ocata

Browse Source
This commit is contained in:
Zuul 2019-01-16 13:50:32 +00:00 committed by Gerrit Code Review
commit 14bf24b231
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manila/utils.py
View File

@ -108,16 +108,8 @@ class SSHPool(pools.Pool):
key_filename=self.path_to_private_key, key_filename=self.path_to_private_key,
look_for_keys=look_for_keys, look_for_keys=look_for_keys,
timeout=self.conn_timeout) timeout=self.conn_timeout)
# Paramiko by default sets the socket timeout to 0.1 seconds,
# ignoring what we set through the sshclient. This doesn't help for
# keeping long lived connections. Hence we have to bypass it, by
# overriding it after the transport is initialized. We are setting
# the sockettimeout to None and setting a keepalive packet so that,
# the server will keep the connection open. All that does is send
# a keepalive packet every ssh_conn_timeout seconds.
if self.conn_timeout: if self.conn_timeout:
transport = ssh.get_transport() transport = ssh.get_transport()
transport.sock.settimeout(None)
transport.set_keepalive(self.conn_timeout) transport.set_keepalive(self.conn_timeout)
return ssh return ssh
except Exception as e: except Exception as e: