mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 09:32:32 +01:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Max Hirschhorn 2019-01-03 18:22:46 -05:00
parent e83d3967ba
commit 63af6676e3
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/evergreen.yml
View File

@ -3078,7 +3078,7 @@ functions:
# For ssh disable the options GSSAPIAuthentication, CheckHostIP, StrictHostKeyChecking # For ssh disable the options GSSAPIAuthentication, CheckHostIP, StrictHostKeyChecking
# & UserKnownHostsFile, since these are local connections from one AWS instance to another. # & UserKnownHostsFile, since these are local connections from one AWS instance to another.
- key: ssh_connection_options - 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 - key: ssh_retries
value: "10" value: "10"
- key: set_sudo - key: set_sudo

11
pytests/powertest.py
View File

@ -1749,7 +1749,7 @@ Examples:
default_ssh_connection_options = ("-o ServerAliveCountMax=10" default_ssh_connection_options = ("-o ServerAliveCountMax=10"
" -o ServerAliveInterval=6" " -o ServerAliveInterval=6"
" -o StrictHostKeyChecking=no" " -o StrictHostKeyChecking=no"
" -o ConnectTimeout=10" " -o ConnectTimeout=30"
" -o ConnectionAttempts=20") " -o ConnectionAttempts=20")
test_options.add_option("--sshConnection", dest="ssh_connection_options", test_options.add_option("--sshConnection", dest="ssh_connection_options",
help="Server ssh additional connection options, i.e., '-i ident.pem'" help="Server ssh additional connection options, i.e., '-i ident.pem'"
@ -2234,9 +2234,12 @@ Examples:
ssh_user, ssh_host = get_user_host(ssh_user_host) ssh_user, ssh_host = get_user_host(ssh_user_host)
mongod_host = ssh_host mongod_host = ssh_host
ssh_connection_options = "{} {}".format(default_ssh_connection_options, # As described in http://man7.org/linux/man-pages/man5/ssh_config.5.html, ssh uses the value of
options.ssh_connection_options # the first occurrence for each parameter, so we have the default connection options follow the
if options.ssh_connection_options else "") # 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, # For remote operations requiring sudo, force pseudo-tty allocation,
# see https://stackoverflow.com/questions/10310299/proper-way-to-sudo-over-ssh. # 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'. # Note - the ssh option RequestTTY was added in OpenSSH 5.9, so we use '-tt'.