parallel: MaxSessions should also be raised if MaxStartups is raised.

This commit is contained in:
Ole Tange 2014-03-27 09:55:12 +01:00
parent 06d55fcec3
commit 19bdd17c63
3 changed files with 3 additions and 3 deletions

View file

@ -3245,7 +3245,7 @@ sub simultaneous_sshlogin_limit {
::warning("ssh to $serverlogin only allows ", ::warning("ssh to $serverlogin only allows ",
"for $ssh_limit simultaneous logins.\n", "for $ssh_limit simultaneous logins.\n",
"You may raise this by changing ", "You may raise this by changing ",
"/etc/ssh/sshd_config:MaxStartups on $serverlogin.\n", "/etc/ssh/sshd_config:MaxStartups and MaxSessions on $serverlogin.\n",
"Using only ",$ssh_limit-1," connections ", "Using only ",$ssh_limit-1," connections ",
"to avoid race conditions.\n"); "to avoid race conditions.\n");
} }

View file

@ -5,7 +5,7 @@ mkdir tmp
cd tmp cd tmp
cat <<'EOF' | sed -e s/\$SERVER1/$SERVER1/\;s/\$SERVER2/$SERVER2/ | stdout parallel -j6 -k -L1 cat <<'EOF' | sed -e s/\$SERVER1/$SERVER1/\;s/\$SERVER2/$SERVER2/ | stdout parallel -j6 -k -L1
echo '### bug #41964: --controlmaster not sems to reuse OpenSSH connections to the same host' echo '### bug #41964: --controlmaster not seems to reuse OpenSSH connections to the same host'
(parallel -S redhat9.tange.dk true ::: {1..20}; echo No --controlmaster - finish last) & (parallel -S redhat9.tange.dk true ::: {1..20}; echo No --controlmaster - finish last) &
(parallel -M -S redhat9.tange.dk true ::: {1..20}; echo With --controlmaster - finish first) & (parallel -M -S redhat9.tange.dk true ::: {1..20}; echo With --controlmaster - finish first) &
wait wait

View file

@ -1,4 +1,4 @@
### bug #41964: --controlmaster not sems to reuse OpenSSH connections to the same host ### bug #41964: --controlmaster not seems to reuse OpenSSH connections to the same host
With --controlmaster - finish first With --controlmaster - finish first
No --controlmaster - finish last No --controlmaster - finish last
### bug #41805: Idea: propagate --env for parallel --number-of-cores ### bug #41805: Idea: propagate --env for parallel --number-of-cores