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
3d9e6479
Commit
3d9e6479
authored
Jun 26, 2012
by
Leo Gordon
Browse files
slightly improved output
parent
0c15bb1b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
11 deletions
+9
-11
modules/Bio/EnsEMBL/Hive/Meadow.pm
modules/Bio/EnsEMBL/Hive/Meadow.pm
+1
-1
modules/Bio/EnsEMBL/Hive/Queen.pm
modules/Bio/EnsEMBL/Hive/Queen.pm
+4
-5
scripts/beekeeper.pl
scripts/beekeeper.pl
+4
-5
No files found.
modules/Bio/EnsEMBL/Hive/Meadow.pm
View file @
3d9e6479
...
...
@@ -31,7 +31,7 @@ sub type { # should return 'LOCAL' or 'LSF'
sub
toString
{
my
$self
=
shift
@_
;
return
"
Meadow
[type='
"
.
$self
->
type
.
"
', name='
"
.
$self
->
name
.
"
']
"
;
return
"
Meadow
:
\t
"
.
$self
->
type
.
'
/
'
.
$self
->
name
;
}
...
...
modules/Bio/EnsEMBL/Hive/Queen.pm
View file @
3d9e6479
...
...
@@ -819,10 +819,10 @@ sub print_analysis_status {
}
sub
print_running_worker_
statu
s
{
sub
print_running_worker_
count
s
{
my
$self
=
shift
;
print
"
=
=====
L
ive
w
orkers according to Queen:
\n
";
print
"
\n
=====
Stats of l
ive
W
orkers according to
the
Queen:
======
\n
";
my
$sql
=
"
SELECT logic_name, count(*) FROM worker, analysis
"
.
"
WHERE worker.analysis_id=analysis.analysis_id AND worker.cause_of_death=''
"
.
"
GROUP BY worker.analysis_id
";
...
...
@@ -831,12 +831,11 @@ sub print_running_worker_status {
my
$sth
=
$self
->
prepare
(
$sql
);
$sth
->
execute
();
while
((
my
$logic_name
,
my
$worker_count
)
=
$sth
->
fetchrow_array
())
{
printf
("
%
2
0s : %d workers
\n
",
$logic_name
,
$worker_count
);
printf
("
%
3
0s : %d workers
\n
",
$logic_name
,
$worker_count
);
$total_workers
+=
$worker_count
;
}
printf
("
%d total workers
\n
",
$total_workers
);
print
"
===========================
\n
";
$sth
->
finish
;
printf
("
%30s : %d workers
\n\n
",
'
======= TOTAL =======
',
$total_workers
);
}
=head2 monitor
...
...
scripts/beekeeper.pl
View file @
3d9e6479
...
...
@@ -178,7 +178,7 @@ sub main {
my
$valley
=
Bio::EnsEMBL::Hive::
Valley
->
new
(
$config
,
$meadow_type
,
$pipeline_name
);
my
$current_meadow
=
$valley
->
get_current_meadow
();
warn
"
Current
meadow:
"
.
$current_meadow
->
toString
.
"
\n
";
warn
"
Current
"
.
$current_meadow
->
toString
.
"
\n
\n
";
$current_meadow
->
config_set
('
TotalRunningWorkersMax
',
$total_running_workers_max
)
if
(
defined
$total_running_workers_max
);
$current_meadow
->
config_set
('
PendingAdjust
',
$pending_adjust
)
if
(
defined
$pending_adjust
);
...
...
@@ -240,15 +240,14 @@ sub main {
$queen
->
synchronize_hive
(
$analysis
);
}
$queen
->
print_analysis_status
(
$analysis
)
unless
(
$self
->
{'
no_analysis_stats
'});
$queen
->
print_running_worker_status
;
if
(
$show_worker_stats
)
{
print
("
===== List of live Workers according to the Queen: ======
\n
"
)
;
print
"
\n
===== List of live Workers according to the Queen: ======
\n
";
foreach
my
$worker
(
@
{
$queen
->
fetch_overdue_workers
(
0
)
})
{
print
$worker
->
toString
()
.
"
\n
";
}
print
"
\n
";
}
$queen
->
print_running_worker_counts
;
$queen
->
schedule_workers
(
$analysis
);
# show what would be submitted, but do not actually submit
$queen
->
get_remaining_jobs_show_hive_progress
();
...
...
@@ -335,7 +334,7 @@ sub run_autonomously {
$queen
->
check_for_dead_workers
(
$valley
,
0
);
$queen
->
print_analysis_status
unless
(
$self
->
{'
no_analysis_stats
'});
$queen
->
print_running_worker_
statu
s
;
$queen
->
print_running_worker_
count
s
;
my
$workers_to_run_by_rc_id
=
$queen
->
schedule_workers_resync_if_necessary
(
$valley
,
$this_analysis
);
...
...
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