Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
ensembl-gh-mirror
ensembl-hive
Commits
b88c72fd
Commit
b88c72fd
authored
Sep 16, 2010
by
Leo Gordon
Browse files
less confusing name for cleanup
parent
11ebc755
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
modules/Bio/EnsEMBL/Hive/Worker.pm
modules/Bio/EnsEMBL/Hive/Worker.pm
+5
-5
scripts/runWorker.pl
scripts/runWorker.pl
+4
-4
No files found.
modules/Bio/EnsEMBL/Hive/Worker.pm
View file @
b88c72fd
...
@@ -367,11 +367,11 @@ sub worker_output_dir {
...
@@ -367,11 +367,11 @@ sub worker_output_dir {
}
}
sub
perform_
global_
cleanup
{
sub
perform_cleanup
{
my
$self
=
shift
;
my
$self
=
shift
;
$self
->
{'
_perform_
global_
cleanup
'}
=
shift
if
(
@
_
);
$self
->
{'
_perform_cleanup
'}
=
shift
if
(
@
_
);
$self
->
{'
_perform_
global_
cleanup
'}
=
1
unless
(
defined
(
$self
->
{'
_perform_
global_
cleanup
'}));
$self
->
{'
_perform_cleanup
'}
=
1
unless
(
defined
(
$self
->
{'
_perform_cleanup
'}));
return
$self
->
{'
_perform_
global_
cleanup
'};
return
$self
->
{'
_perform_cleanup
'};
}
}
sub
print_worker
{
sub
print_worker
{
...
@@ -612,7 +612,7 @@ sub run {
...
@@ -612,7 +612,7 @@ sub run {
}
}
}
while
(
!
$self
->
cause_of_death
);
# /Worker's lifespan loop
}
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
#have runnable cleanup any global/process files/data it may have created
$self
->
cleanup_worker_process_temp_directory
;
$self
->
cleanup_worker_process_temp_directory
;
}
}
...
...
scripts/runWorker.pl
View file @
b88c72fd
...
@@ -72,7 +72,7 @@ GetOptions(
...
@@ -72,7 +72,7 @@ GetOptions(
'
bk=s
'
=>
\
$self
->
{'
beekeeper
'},
# deprecated and ignored
'
bk=s
'
=>
\
$self
->
{'
beekeeper
'},
# deprecated and ignored
'
pid=s
'
=>
\
$self
->
{'
process_id
'},
'
pid=s
'
=>
\
$self
->
{'
process_id
'},
'
input_id=s
'
=>
\
$self
->
{'
input_id
'},
'
input_id=s
'
=>
\
$self
->
{'
input_id
'},
'
no_cleanup
'
=>
\
$self
->
{'
no_
global_
cleanup
'},
'
no_cleanup
'
=>
\
$self
->
{'
no_cleanup
'},
'
analysis_stats
'
=>
\
$self
->
{'
show_analysis_stats
'},
'
analysis_stats
'
=>
\
$self
->
{'
show_analysis_stats
'},
'
no_write
'
=>
\
$self
->
{'
no_write
'},
'
no_write
'
=>
\
$self
->
{'
no_write
'},
'
nowrite
'
=>
\
$self
->
{'
no_write
'},
'
nowrite
'
=>
\
$self
->
{'
no_write
'},
...
@@ -190,8 +190,8 @@ if($self->{'job_limit'}) {
...
@@ -190,8 +190,8 @@ if($self->{'job_limit'}) {
if
(
$self
->
{'
lifespan
'})
{
if
(
$self
->
{'
lifespan
'})
{
$worker
->
life_span
(
$self
->
{'
lifespan
'}
*
60
);
$worker
->
life_span
(
$self
->
{'
lifespan
'}
*
60
);
}
}
if
(
$self
->
{'
no_
global_
cleanup
'})
{
if
(
$self
->
{'
no_cleanup
'})
{
$worker
->
perform_
global_
cleanup
(
0
);
$worker
->
perform_cleanup
(
0
);
}
}
if
(
defined
$self
->
{'
retry_throwing_jobs
'})
{
if
(
defined
$self
->
{'
retry_throwing_jobs
'})
{
$worker
->
retry_throwing_jobs
(
$self
->
{'
retry_throwing_jobs
'});
$worker
->
retry_throwing_jobs
(
$self
->
{'
retry_throwing_jobs
'});
...
@@ -303,7 +303,7 @@ __DATA__
...
@@ -303,7 +303,7 @@ __DATA__
-input_id <string> : test input_id on specified analysis (analysis_id or logic_name)
-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
-job_id <id> : run specific job defined by analysis_job_id
-analysis_stats : show status of each analysis in hive
-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
-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?
-retry_throwing_jobs 0|1 : if a job dies *knowingly*, should we retry it by default?
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment