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: Fixed --retries bug. Passes testsuite.

Browse source
This commit is contained in:
Ole Tange 2010-12-19 01:38:36 +01:00
parent 604ac1c422
commit 27822174c2
5 changed files with 137 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
doc/FUTURE_IDEAS
View file

@ -1,3 +1,28 @@
Til QUOTING:
FN="two spaces"
echo 1 | parallel -q echo {} "$FN"
# Prints 2 spaces between 'two' and 'spaces'
-q will not work with composed commands as it will quote the ; as
well. So composed commands have to be quoted by hand:
# Using export:
FN2="two spaces"
export FN2
echo 1 | parallel echo {} \"\$FN2\" \; echo \"\$FN2\" {}
# Prints 2 spaces between 'two' and 'spaces'
# Without export:
FN3="two spaces"
echo 1 | parallel echo {} \""$FN3"\" \; echo \'"$FN3"\' {}
# By quoting the space in the variable
FN4='two\ \ spaces'
echo 1 | parallel echo {} $FN4 \; echo $FN4 {}
= Bug? ==
locate .gz | parallel -X find {} -size +1000 -size -2000 | parallel --workdir ... -S .. --trc {/}.bz2 'zcat {} | bzip2 > {/}.bz2'

77
src/parallel
View file

@ -36,9 +36,8 @@ if($::opt_skip_first_line) {
<$fh>;
}
$Global::CommandLineQueue = CommandLineQueue->new(
$Global::JobQueue = JobQueue->new(
join(" ",@ARGV),\@fhlist,$Global::Xargs,$number_of_args,\@Global::ret_files);
$Global::JobQueue = JobQueue->new($Global::CommandLineQueue);
init_run_jobs();
my $sem;
@ -485,10 +484,6 @@ sub shell_quote {
for my $a (@strings) {
$a =~ s/([\002-\011\013-\032\\\#\?\`\(\)\*\>\<\~\|\; \"\!\$\&\'])/\\$1/g;
$a =~ s/[\n]/'\n'/g; # filenames with '\n' is quoted using \'
# $arg =~ s/\\/\\\\/g;
# $arg =~ s/([\#\?\`\(\)\*\>\<\~\|\; \"\!\$\&\'])/\\$1/g;
# $arg =~ s/([\002-\011\013-\032])/\\$1/g;
# $arg =~ s/([\n])/'\n'/g; # filenames with '\n' is quoted using \'
}
return wantarray ? @strings : "@strings";
}
@ -869,7 +864,7 @@ sub start_more_jobs {
}
}
for my $sshlogin (values %Global::host) {
debug("Running jobs on ".$sshlogin->string().": ".$sshlogin->jobs_running()."\n");
debug("Running jobs before on ".$sshlogin->string().": ".$sshlogin->jobs_running()."\n");
if($::opt_load and $sshlogin->loadavg_too_high()) {
# The load is too high or unknown
next;
@ -880,14 +875,16 @@ sub start_more_jobs {
}
debug("Try starting a job on ".$sshlogin->string()."\n");
if(start_another_job($sshlogin) == 0) {
# No more jobs to start
# No more jobs to start on this $sshlogin
debug("Empty after retry: ",$Global::JobQueue->empty(),"\n");
last;
}
debug("Job started on ".$sshlogin->string()."\n");
$sshlogin->inc_jobs_running();
$jobs_started++;
}
debug("Running jobs on ".$sshlogin->string().": ".$sshlogin->jobs_running()."\n");
debug("Running jobs after on ".$sshlogin->string().": ".$sshlogin->jobs_running()
." of ".$sshlogin->max_jobs_running() ."\n");
}
}
return $jobs_started;
@ -1575,8 +1572,8 @@ sub processes_available_by_system_limit {
my $wanted_processes = shift;
my $system_limit=0;
my @command_lines=();
my ($next_command_line, $args_ref);
my @jobs=();
my ($job, $args_ref);
my $more_filehandles=1;
my $max_system_proc_reached=0;
my $slow_spawining_warning_printed=0;
@ -1591,19 +1588,24 @@ sub processes_available_by_system_limit {
for my $i (1..8) {
open($fh{"init-$i"},"</dev/null");
}
while($system_limit < $wanted_processes
and (not $Global::CommandLineQueue->empty() or $Global::semaphore)
and $more_filehandles
and not $max_system_proc_reached) {
$system_limit++;
if(not $Global::semaphore) {
my $count_jobs_already_read = $Global::JobQueue->next_seq();
while(1) {
$system_limit >= $wanted_processes and last;
not $more_filehandles and last;
$max_system_proc_reached and last;
if($Global::semaphore) {
} elsif(defined $::opt_retries and $count_jobs_already_read) {
# For retries we may need to run all jobs on this sshlogin
# so include the already read jobs for this sshlogin
$count_jobs_already_read--;
} else {
# If there are no more command lines, then we have a process
# per command line, so no need to go further
($next_command_line) = $Global::CommandLineQueue->get();
push(@command_lines, $next_command_line);
$Global::JobQueue->empty() and last;
($job) = $Global::JobQueue->get();
push(@jobs, $job);
}
$system_limit++;
# Every simultaneous process uses 2 filehandles when grouping
$more_filehandles = open($fh{$system_limit*2},"</dev/null")
@ -1655,7 +1657,7 @@ sub processes_available_by_system_limit {
#wait();
# Cleanup: Unget the command_lines (and args_refs)
$Global::CommandLineQueue->unget(@command_lines);
$Global::JobQueue->unget(@jobs);
if($self->string() ne ":" and
$system_limit > $Global::default_simultaneous_sshlogins) {
$system_limit =
@ -2014,12 +2016,19 @@ package JobQueue;
sub new {
my $class = shift;
my $commandlinequeue = shift;
my $command = shift;
my $read_from = shift;
my $context_replace = shift;
my $max_number_of_args = shift;
my $return_files = shift;
my $commandlinequeue = CommandLineQueue->new(
$command,$read_from,$context_replace,$max_number_of_args,$return_files);
my @unget = ();
return bless {
'unget' => \@unget,
'commandlinequeue' => $commandlinequeue,
'total_jobs' => undef,
'next_seq' => 1,
}, ref($class) || $class;
}
@ -2033,6 +2042,8 @@ sub get {
my $commandline = $self->{'commandlinequeue'}->get();
if(defined $commandline) {
my $job = Job->new($commandline);
$job->set_seq($self->{'next_seq'});
$self->{'next_seq'}++;
return $job;
} else {
return undef;
@ -2066,6 +2077,17 @@ sub total_jobs {
return $self->{'total_jobs'};
}
sub next_seq {
my $self = shift;
return $self->{'next_seq'};
}
sub quote_args {
my $self = shift;
return $self->{'commandlinequeue'}->quote_args();
}
package Job;
@ -2450,7 +2472,7 @@ sub start {
or die "Can't dup \$oldout: $!";
open STDERR, ">&", $Global::original_stderr
or die "Can't dup \$oldout: $!";
return undef;
$command = "true"; # Run the command 'true'
}
} else {
print $Global::original_stderr "$command\n";
@ -2469,11 +2491,6 @@ sub start {
}
$Global::total_running++;
$Global::total_started++;
if(not $job->seq()) {
# This is a new (non-retried) job: Give it a new seq
$Private::job_start_sequence++;
$job->set_seq($Private::job_start_sequence);
}
$ENV{'PARALLEL_SEQ'} = $job->seq();
$ENV{'PARALLEL_PID'} = $$;
::debug("$Global::total_running processes. Starting (".$job->seq()."): $command\n");
@ -3375,7 +3392,7 @@ sub replace {
$s =~ s:^.*/([^/]+)/?$:$1:; # Remove dir from argument. If ending in /, remove final /
$s =~ s:\.[^/\.]*$::; # Remove .ext from argument
}
if($Global::CommandLineQueue->quote_args()) {
if($Global::JobQueue->quote_args()) {
$s = ::shell_quote_scalar($s);
}
$self->{$replacement_string} = $s;

23
src/parallel.pod
View file

@ -659,7 +659,7 @@ default.
If the stdin (standard input) only contains whitespace, do not run the command.
=item B<--retries> I<n>
=item B<--retries> I<n> (beta testing)
If a job fails, retry it on another computer. Do this I<n> times. If
there are fewer than I<n> computers in B<--sshlogin> GNU parallel will
@ -1599,7 +1599,10 @@ and depending on context these needs to be quoted, too:
* ~ & # ! ? space * {
When you want to use a shell variable you need to quote the
Therefore most people will never need more quoting than putting '\'
in front of the special characters.
However, when you want to use a shell variable you need to quote the
$-sign. Here is an example using $PARALLEL_SEQ. This variable is set
by GNU B<parallel> itself, so the evaluation of the $ must be done by
the sub shell started by GNU B<parallel>:
@ -1614,6 +1617,14 @@ B<echo test | parallel echo {} $VAR>
Prints: B<test this_is_set_before_starting>
It is a little more tricky if the variable contains more than one space in a row:
B<VAR="two spaces between each word">
B<echo test | parallel echo {} \'"$VAR"\'>
Prints: B<test two spaces between each word>
If the variable should not be evaluated by the shell starting GNU
B<parallel> but be evaluated by the sub shell started by GNU
B<parallel>, then you need to quote it:
@ -1622,6 +1633,12 @@ B<echo test | parallel VAR=this_is_set_after_starting \; echo {} \$VAR>
Prints: B<test this_is_set_after_starting>
It is a little more tricky if the variable contains space:
B<echo test | parallel VAR='"two spaces between each word"' echo {} \'"$VAR"\'>
Prints: B<test two spaces between each word>
$$ is the shell variable containing the process id of the shell. This
will print the process id of the shell running GNU B<parallel>:
@ -1661,7 +1678,7 @@ can do the quoting by using option -q:
B<ls | parallel -q perl -ne '/^\S+\s+\S+$/ and print $ARGV,"\n"'>
However, this means you cannot make the sub shell interpret special
characters. For example this WILL NOT WORK:
characters. For example because of B<-q> this WILL NOT WORK:
B<ls *.gz | parallel -q "zcat {} >>B<{.}">

28
testsuite/tests-to-run/test32.sh
View file

@ -1,21 +1,37 @@
#!/bin/bash
echo '### Test of --retries'
seq 1 10 | stdout parallel -k --retries 2 -v -S 4.3.2.1,: echo
echo '### Test of --retries - it should run 13 jobs in total'
seq 0 12 | stdout parallel --progress -kj100% --retries 1 -S 12/nlv.pi.dk,1/:,parallel@server2 -vq \
seq 0 12 | stdout parallel --progress -kj100% --retries 1 -S 12/localhost,1/:,parallel@server2 -vq \
perl -e 'sleep 1;print "job{}\n";exit({})' | \
perl -ne 'BEGIN{$/="\r";} @a=(split /\//,$_); END{print $a[1]+$a[4]+$a[7],"\n"}'
echo '### Test of --retries - it should run 25 jobs in total'
seq 0 12 | stdout parallel --progress -kj100% --retries 2 -S 12/nlv.pi.dk,1/:,parallel@server2 -vq \
seq 0 12 | stdout parallel --progress -kj100% --retries 2 -S 12/localhost,1/:,parallel@server2 -vq \
perl -e 'sleep 1;print "job{}\n";exit({})' | \
perl -ne 'BEGIN{$/="\r";} @a=(split /\//,$_); END{print $a[1]+$a[4]+$a[7],"\n"}'
echo '### Test of --retries - it should run 49 jobs in total'
seq 0 12 | stdout parallel --progress -kj100% --retries 4 -S 12/nlv.pi.dk,1/:,parallel@server2 -vq \
seq 0 12 | stdout parallel --progress -kj100% --retries 4 -S 12/localhost,1/:,parallel@server2 -vq \
perl -e 'sleep 1;print "job{}\n";exit({})' | \
perl -ne 'BEGIN{$/="\r";} @a=(split /\//,$_); END{print $a[1]+$a[4]+$a[7],"\n"}'
echo '### Bug with --retries'
seq 1 8 | parallel --retries 2 --sshlogin 8/localhost,8/: -j+0 "hostname; false" | wc -l
seq 1 8 | parallel --retries 2 --sshlogin 8/localhost,8/: -j+1 "hostname; false" | wc -l
seq 1 2 | parallel --retries 2 --sshlogin 8/localhost,8/: -j-1 "hostname; false" | wc -l
seq 1 1 | parallel --retries 2 --sshlogin 1/localhost,1/: -j1 "hostname; false" | wc -l
seq 1 1 | parallel --retries 2 --sshlogin 1/localhost,1/: -j9 "hostname; false" | wc -l
seq 1 1 | parallel --retries 2 --sshlogin 1/localhost,1/: -j0 "hostname; false" | wc -l
seq 1 1 | parallel --retries 2 --sshlogin 1/localhost,1/: -j-1 "hostname; false" | wc -l
echo '### These were not affected by the bug'
seq 1 8 | parallel --retries 2 --sshlogin 1/localhost,9/: -j-1 "hostname; false" | wc -l
seq 1 8 | parallel --retries 2 --sshlogin 8/localhost,8/: -j-1 "hostname; false" | wc -l
seq 1 1 | parallel --retries 2 --sshlogin 1/localhost,1/: "hostname; false" | wc -l
seq 1 4 | parallel --retries 2 --sshlogin 2/localhost,2/: -j-1 "hostname; false" | wc -l
seq 1 4 | parallel --retries 2 --sshlogin 2/localhost,2/: -j1 "hostname; false" | wc -l
seq 1 4 | parallel --retries 2 --sshlogin 1/localhost,1/: -j1 "hostname; false" | wc -l
seq 1 2 | parallel --retries 2 --sshlogin 1/localhost,1/: -j1 "hostname; false" | wc -l
echo '### Test of --retries on unreachable host'
seq 1 10 | stdout parallel -k --retries 2 -v -S 4.3.2.1,: echo

30
testsuite/wanted-results/test32
View file

@ -1,4 +1,26 @@
### Test of --retries
### Test of --retries - it should run 13 jobs in total
13
### Test of --retries - it should run 25 jobs in total
25
### Test of --retries - it should run 49 jobs in total
49
### Bug with --retries
8
8
2
1
1
1
1
### These were not affected by the bug
8
8
1
4
4
4
2
### Test of --retries on unreachable host
echo 1
1
echo 2
@ -19,9 +41,3 @@ echo 9
9
echo 10
10
### Test of --retries - it should run 13 jobs in total
13
### Test of --retries - it should run 25 jobs in total
25
### Test of --retries - it should run 49 jobs in total
49