Permalink
Browse files

SERVER-37490 Increase ssh ConnectTimeout from 10 to 30 seconds.

  • Loading branch information...
visemet committed Jan 3, 2019
1 parent e83d396 commit 63af6676e353eafa00b6178737085606836e6139
Showing with 8 additions and 5 deletions.
  1. +1 −1 etc/evergreen.yml
  2. +7 −4 pytests/powertest.py
@@ -3078,7 +3078,7 @@ functions:
# For ssh disable the options GSSAPIAuthentication, CheckHostIP, StrictHostKeyChecking
# & UserKnownHostsFile, since these are local connections from one AWS instance to another.
- key: ssh_connection_options
value: -o GSSAPIAuthentication=no -o CheckHostIP=no -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ConnectTimeout=10 -o ConnectionAttempts=20
value: -o GSSAPIAuthentication=no -o CheckHostIP=no -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ConnectTimeout=30 -o ConnectionAttempts=20
- key: ssh_retries
value: "10"
- key: set_sudo
@@ -1749,7 +1749,7 @@ def main(): # pylint: disable=too-many-branches,too-many-locals,too-many-statem
default_ssh_connection_options = ("-o ServerAliveCountMax=10"
" -o ServerAliveInterval=6"
" -o StrictHostKeyChecking=no"
" -o ConnectTimeout=10"
" -o ConnectTimeout=30"
" -o ConnectionAttempts=20")
test_options.add_option("--sshConnection", dest="ssh_connection_options",
help="Server ssh additional connection options, i.e., '-i ident.pem'"
@@ -2234,9 +2234,12 @@ def main(): # pylint: disable=too-many-branches,too-many-locals,too-many-statem
ssh_user, ssh_host = get_user_host(ssh_user_host)
mongod_host = ssh_host

ssh_connection_options = "{} {}".format(default_ssh_connection_options,
options.ssh_connection_options
if options.ssh_connection_options else "")
# As described in http://man7.org/linux/man-pages/man5/ssh_config.5.html, ssh uses the value of
# the first occurrence for each parameter, so we have the default connection options follow the
# user-specified --sshConnection options.
ssh_connection_options = "{} {}".format(options.ssh_connection_options
if options.ssh_connection_options else "",
default_ssh_connection_options)
# For remote operations requiring sudo, force pseudo-tty allocation,
# see https://stackoverflow.com/questions/10310299/proper-way-to-sudo-over-ssh.
# Note - the ssh option RequestTTY was added in OpenSSH 5.9, so we use '-tt'.

0 comments on commit 63af667

Please sign in to comment.