Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/parallel

This commit is contained in:
Ole Tange 2014-03-23 01:08:07 +01:00
commit f30bad56e2
3 changed files with 7 additions and 7 deletions

View file

@ -3242,7 +3242,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:MaxStartup on $serverlogin.\n", "/etc/ssh/sshd_config:MaxStartups 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

@ -2994,7 +2994,7 @@ Remote execution
R4. Result files can be transferred R4. Result files can be transferred
R5. Cleanup of transferred files R5. Cleanup of transferred files
R6. No config files needed R6. No config files needed
R7. Do not run more than SSHD's MaxStartup can handle R7. Do not run more than SSHD's MaxStartups can handle
R8. Configurable SSH command R8. Configurable SSH command
R9. Retry if connection breaks occasionally R9. Retry if connection breaks occasionally
@ -3379,7 +3379,7 @@ parallel mogrify -flip ::: *.jpg
B<dxargs> is also a tool for running jobs in parallel. B<dxargs> is also a tool for running jobs in parallel.
B<dxargs> does not deal well with more simultaneous jobs than SSHD's B<dxargs> does not deal well with more simultaneous jobs than SSHD's
MaxStartup. B<dxargs> is only built for remote run jobs, but does not MaxStartups. B<dxargs> is only built for remote run jobs, but does not
support transferring of files. support transferring of files.
@ -3633,7 +3633,7 @@ Using B<--ungroup> the 3 ms can be lowered to around 2 ms.
When using multiple computers GNU B<parallel> opens B<ssh> connections When using multiple computers GNU B<parallel> opens B<ssh> connections
to them to figure out how many connections can be used reliably to them to figure out how many connections can be used reliably
simultaneously (Namely SSHD's MaxStartup). This test is done for each simultaneously (Namely SSHD's MaxStartups). This test is done for each
host in serial, so if your B<--sshloginfile> contains many hosts it may host in serial, so if your B<--sshloginfile> contains many hosts it may
be slow. be slow.

View file

@ -3220,7 +3220,7 @@ Remote execution
R4. Result files can be transferred R4. Result files can be transferred
R5. Cleanup of transferred files R5. Cleanup of transferred files
R6. No config files needed R6. No config files needed
R7. Do not run more than SSHD's MaxStartup can handle R7. Do not run more than SSHD's MaxStartups can handle
R8. Configurable SSH command R8. Configurable SSH command
R9. Retry if connection breaks occasionally R9. Retry if connection breaks occasionally
@ -3611,7 +3611,7 @@ parallel mogrify -flip ::: *.jpg
@strong{dxargs} is also a tool for running jobs in parallel. @strong{dxargs} is also a tool for running jobs in parallel.
@strong{dxargs} does not deal well with more simultaneous jobs than SSHD's @strong{dxargs} does not deal well with more simultaneous jobs than SSHD's
MaxStartup. @strong{dxargs} is only built for remote run jobs, but does not MaxStartups. @strong{dxargs} is only built for remote run jobs, but does not
support transferring of files. support transferring of files.
@section DIFFERENCES BETWEEN mdm/middleman AND GNU Parallel @section DIFFERENCES BETWEEN mdm/middleman AND GNU Parallel
@ -3898,7 +3898,7 @@ Using @strong{--ungroup} the 3 ms can be lowered to around 2 ms.
When using multiple computers GNU @strong{parallel} opens @strong{ssh} connections When using multiple computers GNU @strong{parallel} opens @strong{ssh} connections
to them to figure out how many connections can be used reliably to them to figure out how many connections can be used reliably
simultaneously (Namely SSHD's MaxStartup). This test is done for each simultaneously (Namely SSHD's MaxStartups). This test is done for each
host in serial, so if your @strong{--sshloginfile} contains many hosts it may host in serial, so if your @strong{--sshloginfile} contains many hosts it may
be slow. be slow.