Commit 7053ac66 authored by Rafael Monnerat's avatar Rafael Monnerat Committed by Marco Mariani

Resilience: Increase timeout for ssh server and client to 5 minutes.

parent 10e156c9
...@@ -112,6 +112,8 @@ class Recipe(GenericBaseRecipe): ...@@ -112,6 +112,8 @@ class Recipe(GenericBaseRecipe):
dropbear_cmd.extend(['-p', binding_address]) dropbear_cmd.extend(['-p', binding_address])
# Single user mode # Single user mode
dropbear_cmd.append('-n') dropbear_cmd.append('-n')
# Keep connection alive for 5 minutes
dropbear_cmd.extend(['-K', '300'])
if 'dss-keyfile' in self.options: if 'dss-keyfile' in self.options:
dropbear_cmd.extend(['-d', self.options['dss-keyfile']]) dropbear_cmd.extend(['-d', self.options['dss-keyfile']])
......
...@@ -101,7 +101,7 @@ class Recipe(GenericSlapRecipe, Notify, Callback): ...@@ -101,7 +101,7 @@ class Recipe(GenericSlapRecipe, Notify, Callback):
# XXX use -y because the host might not yet be in the # XXX use -y because the host might not yet be in the
# trusted hosts file until the next time slapgrid is run. # trusted hosts file until the next time slapgrid is run.
rdiffbackup_remote_schema = '%(ssh)s -y -p %%s %(user)s@%(host)s' % { rdiffbackup_remote_schema = '%(ssh)s -y -K 300 -p %%s %(user)s@%(host)s' % {
'ssh': self.options['sshclient-binary'], 'ssh': self.options['sshclient-binary'],
'user': parsed_url.username, 'user': parsed_url.username,
'host': parsed_url.hostname, 'host': parsed_url.hostname,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment