Skip to content
Snippets Groups Projects
Commit b88c72fd authored by Leo Gordon's avatar Leo Gordon
Browse files

less confusing name for cleanup

parent 11ebc755
No related branches found
No related tags found
No related merge requests found
......@@ -367,11 +367,11 @@ sub worker_output_dir {
}
sub perform_global_cleanup {
sub perform_cleanup {
my $self = shift;
$self->{'_perform_global_cleanup'} = shift if(@_);
$self->{'_perform_global_cleanup'} = 1 unless(defined($self->{'_perform_global_cleanup'}));
return $self->{'_perform_global_cleanup'};
$self->{'_perform_cleanup'} = shift if(@_);
$self->{'_perform_cleanup'} = 1 unless(defined($self->{'_perform_cleanup'}));
return $self->{'_perform_cleanup'};
}
sub print_worker {
......@@ -612,7 +612,7 @@ sub run {
}
} while (!$self->cause_of_death); # /Worker's lifespan loop
if($self->perform_global_cleanup) {
if($self->perform_cleanup) {
#have runnable cleanup any global/process files/data it may have created
$self->cleanup_worker_process_temp_directory;
}
......
......@@ -72,7 +72,7 @@ GetOptions(
'bk=s' => \$self->{'beekeeper'}, # deprecated and ignored
'pid=s' => \$self->{'process_id'},
'input_id=s' => \$self->{'input_id'},
'no_cleanup' => \$self->{'no_global_cleanup'},
'no_cleanup' => \$self->{'no_cleanup'},
'analysis_stats' => \$self->{'show_analysis_stats'},
'no_write' => \$self->{'no_write'},
'nowrite' => \$self->{'no_write'},
......@@ -190,8 +190,8 @@ if($self->{'job_limit'}) {
if($self->{'lifespan'}) {
$worker->life_span($self->{'lifespan'} * 60);
}
if($self->{'no_global_cleanup'}) {
$worker->perform_global_cleanup(0);
if($self->{'no_cleanup'}) {
$worker->perform_cleanup(0);
}
if(defined $self->{'retry_throwing_jobs'}) {
$worker->retry_throwing_jobs($self->{'retry_throwing_jobs'});
......@@ -303,7 +303,7 @@ __DATA__
-input_id <string> : test input_id on specified analysis (analysis_id or logic_name)
-job_id <id> : run specific job defined by analysis_job_id
-analysis_stats : show status of each analysis in hive
-no_cleanup : don't perform global_cleanup when worker exits
-no_cleanup : don't perform temp directory cleanup when worker exits
-no_write : don't write_output or auto_dataflow input_job
-retry_throwing_jobs 0|1 : if a job dies *knowingly*, should we retry it by default?
......
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