tange/parallel
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/parallel.git synced 2024-11-21 21:47:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

parallel: Remote CPU detection could crashed, if parallel was not installed.

Browse source
This commit is contained in:
Ole Tange 2022-09-22 19:38:14 +02:00
parent b963066e9e
commit e9a7bdcd37
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/parallel
View file

@ -4865,10 +4865,10 @@ sub filter_hosts() {
defined $nthreads or ::die_bug("nthreads missing: $string"); defined $nthreads or ::die_bug("nthreads missing: $string");
defined $time_to_login or ::die_bug("time_to_login missing: $string"); defined $time_to_login or ::die_bug("time_to_login missing: $string");
defined $maxlen or ::die_bug("maxlen missing: $string"); defined $maxlen or ::die_bug("maxlen missing: $string");
# ncpus may be set by 4/hostname # ncpus may be set by 4/hostname or may be undefined yet
my $ncpus = $sshlogin->ncpus(); my $ncpus = $sshlogin->{'ncpus'};
# $nthreads may be 0 if GNU Parallel is not installed remotely # $nthreads may be 0 if GNU Parallel is not installed remotely
$ncpus = $nthreads || $ncpus; $ncpus = $nthreads || $ncpus || $sshlogin->ncpus();
if($opt::use_cpus_instead_of_cores) { if($opt::use_cpus_instead_of_cores) {
$ncpus = $ncores || $ncpus; $ncpus = $ncores || $ncpus;
} elsif($opt::use_sockets_instead_of_threads) { } elsif($opt::use_sockets_instead_of_threads) {
@ -4923,7 +4923,7 @@ sub parse_host_filtering() {
} }
# Get server from: eval true server\; # Get server from: eval true server\;
$col[8] =~ /eval .?true.?\s([^\;]+);/ or $col[8] =~ /eval .?true.?\s([^\;]+);/ or
::die_bug("col8 does not contain host: $col[8]"); ::die_bug("col8 does not contain host: $col[8] in $_");
my $host = $1; my $host = $1;
$host =~ tr/\\//d; $host =~ tr/\\//d;
$Global::host{$host} or next; $Global::host{$host} or next;
@ -5006,12 +5006,9 @@ sub parallelized_host_filtering() {
# Return $default_value if command fails # Return $default_value if command fails
my $sshlogin = shift; my $sshlogin = shift;
my $command = shift; my $command = shift;
my $default_value = shift; # wrapper that returns output "0\n" if the command fails
# wrapper that returns $default_value if the command fails: # E.g. parallel not installed => "0\n"
# bug #57886: Errors when using different version on remote my $wcmd = q(perl -e '$a=`).$command.q(`; print $? ? "0".v010 : $a');
# perl -e '$a=`$command`; print $? ? "$default_value" : $a'
my $wcmd = q(perl -e '$a=`).$command.q(`;).
q(print $? ? ").::pQ($default_value."\n").q(" : $a');
my $commandline = CommandLine->new(1,[$wcmd],{},0,0,[],[],[],[],{},{}); my $commandline = CommandLine->new(1,[$wcmd],{},0,0,[],[],[],[],{},{});
my $job = Job->new($commandline); my $job = Job->new($commandline);
$job->set_sshlogin($sshlogin); $job->set_sshlogin($sshlogin);
@ -5024,14 +5021,14 @@ sub parallelized_host_filtering() {
if($host eq ":") { next } if($host eq ":") { next }
# The 'true' is used to get the $host out later # The 'true' is used to get the $host out later
push(@sockets, $host."\t"."true $host; ". push(@sockets, $host."\t"."true $host; ".
sshwrapped($sshlogin,"parallel --number-of-sockets",0)."\n\0"); sshwrapped($sshlogin,"parallel --number-of-sockets")."\n\0");
push(@cores, $host."\t"."true $host; ". push(@cores, $host."\t"."true $host; ".
sshwrapped($sshlogin,"parallel --number-of-cores",0)."\n\0"); sshwrapped($sshlogin,"parallel --number-of-cores")."\n\0");
push(@threads, $host."\t"."true $host; ". push(@threads, $host."\t"."true $host; ".
sshwrapped($sshlogin,"parallel --number-of-threads",0)."\n\0"); sshwrapped($sshlogin,"parallel --number-of-threads")."\n\0");
push(@maxline, $host."\t"."true $host; ". push(@maxline, $host."\t"."true $host; ".
sshwrapped($sshlogin, sshwrapped($sshlogin,
"parallel --max-line-length-allowed",0)."\n\0"); "parallel --max-line-length-allowed")."\n\0");
# 'echo' is used to get the fastest possible ssh login time # 'echo' is used to get the fastest possible ssh login time
push(@echo, $host."\t"."true $host; ". push(@echo, $host."\t"."true $host; ".
$sshlogin->wrap("echo $host")."\n\0"); $sshlogin->wrap("echo $host")."\n\0");