openstack/cinder
Code Issues Proposed changes

Merge "Allow disabling of long-lived SSH connections."

Browse Source
This commit is contained in:
Jenkins
2013-02-07 18:04:17 +00:00
committed by Gerrit Code Review
parent 9b9a0b154b b8d7170711
commit 835fb61442
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cinder/utils.py
View File

@@ -277,7 +277,7 @@ class SSHPool(pools.Pool):
self.port = port self.port = port
self.login = login self.login = login
self.password = password self.password = password
self.conn_timeout = conn_timeout self.conn_timeout = conn_timeout if conn_timeout else None
self.privatekey = privatekey self.privatekey = privatekey
super(SSHPool, self).__init__(*args, **kwargs) super(SSHPool, self).__init__(*args, **kwargs)
@@ -310,9 +310,10 @@ class SSHPool(pools.Pool):
# the sockettimeout to None and setting a keepalive packet so that, # the sockettimeout to None and setting a keepalive packet so that,
# the server will keep the connection open. All that does is send # the server will keep the connection open. All that does is send
# a keepalive packet every ssh_conn_timeout seconds. # a keepalive packet every ssh_conn_timeout seconds.
transport = ssh.get_transport() if self.conn_timeout:
transport.sock.settimeout(None) transport = ssh.get_transport()
transport.set_keepalive(self.conn_timeout) transport.sock.settimeout(None)
transport.set_keepalive(self.conn_timeout)
return ssh return ssh
except Exception as e: except Exception as e:
msg = _("Error connecting via ssh: %s") % e msg = _("Error connecting via ssh: %s") % e