Commit acf87ba7 authored by Matthieu Muffato's avatar Matthieu Muffato
Browse files

Merge branch 'version/2.2' into version/2.3

* version/2.2:
  Check that the analysis is not BLOCKED before running a special-batch (i.e. runWorker with a job_id)
parents 508a859e 76508b59
......@@ -230,13 +230,16 @@ sub specialize_worker {
die "Job with dbID='$job_id' is $job_status, please use -force 1 to override";
}
$analysis = $job->analysis;
if(($analysis->stats->status eq 'BLOCKED') and !$force) {
die "Analysis is BLOCKED, can't specialize a worker. Please use -force 1 to override";
}
if(($job_status eq 'DONE') and $job->semaphored_job_id) {
warn "Increasing the semaphore count of the dependent job";
$job_adaptor->increase_semaphore_count_for_jobid( $job->semaphored_job_id );
}
$analysis = $job->analysis;
} else {
$analyses_pattern //= '%'; # for printing
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment