Commit 8ff11761 authored by Leo Gordon's avatar Leo Gordon
Browse files

removed 'sema_fan_branch_code' parameter since you can now set up a semaphored...

removed 'sema_fan_branch_code' parameter since you can now set up a semaphored group via PipeConfig' language
parent 48b5f0e2
......@@ -28,9 +28,6 @@ You can supply as parameter one of 4 sources of ids from which the batches will
param('inputcmd'); The list is generated by running a system command: 'inputcmd' => 'find /tmp/big_directory -type f'
If 'sema_funnel_branch_code' is defined, it becomes the destination branch for a semaphored funnel job,
whose count is automatically set to the number of fan jobs that it will be waiting for.
=cut
package Bio::EnsEMBL::Hive::RunnableDB::JobFactory;
......@@ -146,8 +143,6 @@ sub run {
param('fan_branch_code'): defines the branch where the fan of jobs is created (2 by default).
param('sema_funnel_branch_code'): defines the branch where the semaphored funnel for the fan is created (no default - skipped if not defined)
=cut
sub write_output { # nothing to write out, but some dataflow to perform:
......@@ -155,21 +150,9 @@ sub write_output { # nothing to write out, but some dataflow to perform:
my $output_ids = $self->param('output_ids');
my $fan_branch_code = $self->param('fan_branch_code') || 2;
my $sema_funnel_branch_code = $self->param('sema_funnel_branch_code'); # if set, it is a request for a semaphored funnel
if($sema_funnel_branch_code) {
# first flow into the sema_funnel_branch
my ($funnel_job_id) = @{ $self->dataflow_output_id($self->input_id, $sema_funnel_branch_code, { -semaphore_count => scalar(@$output_ids) }) };
# then "fan out" into fan_branch, and pass the $funnel_job_id to all of them
my $fan_job_ids = $self->dataflow_output_id($output_ids, $fan_branch_code, { -semaphored_job_id => $funnel_job_id } );
} else {
# simply "fan out" into fan_branch_code:
$self->dataflow_output_id($output_ids, $fan_branch_code);
}
# "fan out" into fan_branch_code:
$self->dataflow_output_id($output_ids, $fan_branch_code);
}
......
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