Commit fde618c7 authored by Leo Gordon's avatar Leo Gordon
Browse files

avoid repeating the input_id parameter, as it is done centrally in AnalysisJob::dataflow_output_id

parent fe68e863
...@@ -608,7 +608,7 @@ sub gc_dataflow { ...@@ -608,7 +608,7 @@ sub gc_dataflow {
$job->load_parameters(); # input_id_templates still supported, however to a limited extent $job->load_parameters(); # input_id_templates still supported, however to a limited extent
$job->dataflow_output_id( $job->input_id() , $branch_name ); $job->dataflow_output_id( undef, $branch_name );
$job->set_and_update_status('PASSED_ON'); $job->set_and_update_status('PASSED_ON');
......
...@@ -125,13 +125,13 @@ sub write_output { ...@@ -125,13 +125,13 @@ sub write_output {
# We create a dataflow event depending on the exit code of the process. # We create a dataflow event depending on the exit code of the process.
if (exists $self->param('return_codes_2_branches')->{$return_value}) { if (exists $self->param('return_codes_2_branches')->{$return_value}) {
my $branch_number = $self->param('return_codes_2_branches')->{$return_value}; my $branch_number = $self->param('return_codes_2_branches')->{$return_value};
$self->dataflow_output_id( $self->input_id, $branch_number ); $self->dataflow_output_id( undef, $branch_number );
$self->input_job->autoflow(0); $self->input_job->autoflow(0);
$self->complete_early(sprintf("The command exited with code %d, which is mapped to a dataflow on branch #%d.\n", $return_value, $branch_number)); $self->complete_early(sprintf("The command exited with code %d, which is mapped to a dataflow on branch #%d.\n", $return_value, $branch_number));
} }
if ($stderr =~ /Exception in thread ".*" java.lang.OutOfMemoryError: Java heap space at/) { if ($stderr =~ /Exception in thread ".*" java.lang.OutOfMemoryError: Java heap space at/) {
my $job_ids = $self->dataflow_output_id( $self->input_id, -1 ); my $job_ids = $self->dataflow_output_id( undef, -1 );
if (scalar(@$job_ids)) { if (scalar(@$job_ids)) {
$self->input_job->autoflow(0); $self->input_job->autoflow(0);
$self->complete_early("Java heap space is out of memory. A job has been dataflown to the -1 branch.\n"); $self->complete_early("Java heap space is out of memory. A job has been dataflown to the -1 branch.\n");
......
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