Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
ensembl-gh-mirror
ensembl-hive
Commits
834b7a34
Commit
834b7a34
authored
May 16, 2017
by
Matthieu Muffato
Browse files
Cleaning-up /tmp is now optional (until we have assessed its impact on beekeeper
parent
738b235c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
hive_config.json
hive_config.json
+1
-0
modules/Bio/EnsEMBL/Hive/Queen.pm
modules/Bio/EnsEMBL/Hive/Queen.pm
+0
-1
modules/Bio/EnsEMBL/Hive/Valley.pm
modules/Bio/EnsEMBL/Hive/Valley.pm
+5
-2
No files found.
hive_config.json
View file @
834b7a34
...
...
@@ -7,6 +7,7 @@
"SubmitWorkersMax"
:
50
},
"Meadow"
:
{
"CleanupTempDirectoryKilledWorkers"
:
0
,
"LOCAL"
:
{
"TotalRunningWorkersMax"
:
2
,
"my-quadcore-desktop"
:
{
...
...
modules/Bio/EnsEMBL/Hive/Queen.pm
View file @
834b7a34
...
...
@@ -443,7 +443,6 @@ sub check_for_dead_workers { # scans the whole Valley for lost Workers (but i
$worker
->
cause_of_death
(
$report_entries
->
{
$process_id
}{'
cause_of_death
'}
);
$self
->
register_worker_death
(
$worker
);
if
(
$worker
->
meadow_user
eq
$ENV
{'
USER
'})
{
# if I'm actually allowed to kill the worker...
warn
"
GarbageCollector:
\t
Cleaning-up /tmp
\n
";
$valley
->
cleanup_left_temp_directory
(
$worker
);
}
}
...
...
modules/Bio/EnsEMBL/Hive/Valley.pm
View file @
834b7a34
...
...
@@ -255,8 +255,11 @@ sub cleanup_left_temp_directory {
# This guarantees that $meadow is defined.
my
$meadow
=
$self
->
available_meadow_hash
->
{
$worker
->
meadow_type
};
my
$rc
=
$meadow
->
run_on_host
(
$worker
->
meadow_host
,
$worker
->
meadow_user
,
['
rm
',
'
-rf
',
$worker
->
temp_directory_name
]);
$worker
->
worker_say
(
sprintf
("
Error: could not clean %s's temp directory '%s': %s
\n
",
$worker
->
meadow_host
,
$worker
->
temp_directory_name
,
$@
))
if
$rc
;
if
(
$meadow
->
config_get
('
CleanupTempDirectoryKilledWorkers
'))
{
warn
"
GarbageCollector:
\t
Cleaning-up /tmp
\n
";
my
$rc
=
$meadow
->
run_on_host
(
$worker
->
meadow_host
,
$worker
->
meadow_user
,
['
rm
',
'
-rf
',
$worker
->
temp_directory_name
]);
$worker
->
worker_say
(
sprintf
("
Error: could not clean %s's temp directory '%s': %s
\n
",
$worker
->
meadow_host
,
$worker
->
temp_directory_name
,
$@
))
if
$rc
;
}
}
...
...
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