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

parallel: Fixed bug #47644: Wrong slot number replacement when resuming.

Browse source
This commit is contained in:
Ole Tange 2016-04-10 00:35:32 +02:00
parent 39fb9d179e
commit 2aea2879c9
1 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/parallel
View file

@ -2252,6 +2252,9 @@ sub init_run_jobs {
$sshlogin->string(), "\n"); $sshlogin->string(), "\n");
return 0; return 0;
} }
if($job->is_already_in_joblog()) {
$job->free_slot();
}
} while ($job->is_already_in_joblog() } while ($job->is_already_in_joblog()
or or
($opt::results and $opt::resume and $job->is_already_in_results())); ($opt::results and $opt::resume and $job->is_already_in_results()));
@ -2719,7 +2722,8 @@ sub get_job_with_sshlogin {
# This command with these args failed for this sshlogin # This command with these args failed for this sshlogin
my ($no_of_failed_sshlogins,$min_failures) = $job->min_failed(); my ($no_of_failed_sshlogins,$min_failures) = $job->min_failed();
# Only look at the Global::host that have > 0 jobslots # Only look at the Global::host that have > 0 jobslots
if($no_of_failed_sshlogins == grep { $_->max_jobs_running() > 0 } values %Global::host if($no_of_failed_sshlogins ==
grep { $_->max_jobs_running() > 0 } values %Global::host
and $job->failed_here() == $min_failures) { and $job->failed_here() == $min_failures) {
# It failed the same or more times on another host: # It failed the same or more times on another host:
# run it on this host # run it on this host
@ -3361,7 +3365,6 @@ sub reaper {
# %Global::sshmaster # %Global::sshmaster
# %Global::running # %Global::running
# $Global::tty_taken # $Global::tty_taken
# @Global::slots
# $opt::timeout # $opt::timeout
# $Global::timeoutq # $Global::timeoutq
# $opt::halt # $opt::halt
@ -3408,7 +3411,7 @@ sub reaper {
if(not $job->should_be_retried()) { if(not $job->should_be_retried()) {
# The job is done # The job is done
# Free the jobslot # Free the jobslot
push @Global::slots, $job->slot(); $job->free_slot();
if($opt::timeout) { if($opt::timeout) {
# Update average runtime for timeout # Update average runtime for timeout
$Global::timeoutq->update_median_runtime($job->runtime()); $Global::timeoutq->update_median_runtime($job->runtime());
@ -6118,6 +6121,11 @@ sub slot {
return $self->{'commandline'}->slot(); return $self->{'commandline'}->slot();
} }
sub free_slot {
my $self = shift;
return $self->{'commandline'}->free_slot();
}
{ {
my($cattail); my($cattail);
@ -8253,23 +8261,28 @@ sub set_seq {
{ {
my $max_slot_number; my $max_slot_number;
my @slots;
sub slot { sub slot {
# Find the number of a free job slot and return it # Find the number of a free job slot and return it
# Uses:
# @Global::slots - list with free jobslots
# Returns: # Returns:
# $jobslot = number of jobslot # $jobslot = number of jobslot
my $self = shift; my $self = shift;
if(not $self->{'slot'}) { if(not $self->{'slot'}) {
if(not @Global::slots) { if(not @slots) {
# $Global::max_slot_number will typically be $Global::max_jobs_running # $max_slot_number will typically be $Global::max_jobs_running
push @Global::slots, ++$max_slot_number; push @slots, ++$max_slot_number;
} }
$self->{'slot'} = shift @Global::slots; $self->{'slot'} = shift @slots;
} }
return $self->{'slot'}; return $self->{'slot'};
} }
sub free_slot {
# Make this slot available again
my $self = shift;
push @slots, $self->{'slot'};
}
} }
sub populate { sub populate {