Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
ensembl-hive
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
Code
Merge requests
7
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ensembl-gh-mirror
ensembl-hive
Commits
a7f464f8
Commit
a7f464f8
authored
12 years ago
by
Leo Gordon
Browse files
Options
Downloads
Patches
Plain Diff
removed PendingAdjust option from beekeeper and config file as it never really needs to be unset
parent
80eaddf3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
hive_config.json
+0
-1
0 additions, 1 deletion
hive_config.json
modules/Bio/EnsEMBL/Hive/Queen.pm
+1
-1
1 addition, 1 deletion
modules/Bio/EnsEMBL/Hive/Queen.pm
scripts/beekeeper.pl
+0
-4
0 additions, 4 deletions
scripts/beekeeper.pl
with
1 addition
and
6 deletions
hive_config.json
+
0
−
1
View file @
a7f464f8
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
"Meadow"
:
{
#
configure
Meadow-specific
options
here:
"Meadow"
:
{
#
configure
Meadow-specific
options
here:
"LSF"
:
{
"LSF"
:
{
"SubmissionOptions"
:
""
,
#
general
options
that
different
Meadows
can
plug
into
the
submission
command
"SubmissionOptions"
:
""
,
#
general
options
that
different
Meadows
can
plug
into
the
submission
command
"PendingAdjust"
:
1
,
#
if
set
and
->can('count_pending_workers_by_rc_id')
,
adjusts
submitted
workers
by
those
in
pending
state
"TotalRunningWorkersMax"
:
1000
,
#
how
many
workers
can
be
run
on
this
Meadow
in
total
"TotalRunningWorkersMax"
:
1000
,
#
how
many
workers
can
be
run
on
this
Meadow
in
total
"farm2"
:
{
"farm2"
:
{
"SubmitWorkersMax"
:
50
,
#
if
set
,
provides
a
cut-off
on
the
number
of
workers
being
submitted
each
iteration
"SubmitWorkersMax"
:
50
,
#
if
set
,
provides
a
cut-off
on
the
number
of
workers
being
submitted
each
iteration
...
...
This diff is collapsed.
Click to expand it.
modules/Bio/EnsEMBL/Hive/Queen.pm
+
1
−
1
View file @
a7f464f8
...
@@ -816,7 +816,7 @@ sub schedule_workers_resync_if_necessary {
...
@@ -816,7 +816,7 @@ sub schedule_workers_resync_if_necessary {
my
$meadow
=
$valley
->
get_current_meadow
();
my
$meadow
=
$valley
->
get_current_meadow
();
my
$pending_by_rc_name
=
(
$meadow
->
can
('
count_pending_workers_by_rc_name
')
and
$meadow
->
config_get
('
PendingAdjust
'))
?
$meadow
->
count_pending_workers_by_rc_name
()
:
{};
my
$pending_by_rc_name
=
$meadow
->
can
('
count_pending_workers_by_rc_name
')
?
$meadow
->
count_pending_workers_by_rc_name
()
:
{};
my
$submit_limit
=
$meadow
->
config_get
('
SubmitWorkersMax
');
my
$submit_limit
=
$meadow
->
config_get
('
SubmitWorkersMax
');
my
$meadow_limit
=
(
$meadow
->
can
('
count_running_workers
')
and
defined
(
$meadow
->
config_get
('
TotalRunningWorkersMax
')))
?
$meadow
->
config_get
('
TotalRunningWorkersMax
')
-
$meadow
->
count_running_workers
:
undef
;
my
$meadow_limit
=
(
$meadow
->
can
('
count_running_workers
')
and
defined
(
$meadow
->
config_get
('
TotalRunningWorkersMax
')))
?
$meadow
->
config_get
('
TotalRunningWorkersMax
')
-
$meadow
->
count_running_workers
:
undef
;
...
...
This diff is collapsed.
Click to expand it.
scripts/beekeeper.pl
+
0
−
4
View file @
a7f464f8
...
@@ -30,7 +30,6 @@ sub main {
...
@@ -30,7 +30,6 @@ sub main {
my
$local
=
0
;
my
$local
=
0
;
my
$show_failed_jobs
=
0
;
my
$show_failed_jobs
=
0
;
my
$meadow_type
=
undef
;
my
$meadow_type
=
undef
;
my
$pending_adjust
=
undef
;
my
$submit_workers_max
=
undef
;
my
$submit_workers_max
=
undef
;
my
$total_running_workers_max
=
undef
;
my
$total_running_workers_max
=
undef
;
my
$submission_options
=
undef
;
my
$submission_options
=
undef
;
...
@@ -76,7 +75,6 @@ sub main {
...
@@ -76,7 +75,6 @@ sub main {
'
meadow_type=s
'
=>
\
$meadow_type
,
'
meadow_type=s
'
=>
\
$meadow_type
,
'
total_running_workers_max=i
'
=>
\
$total_running_workers_max
,
'
total_running_workers_max=i
'
=>
\
$total_running_workers_max
,
'
submit_workers_max=i
'
=>
\
$submit_workers_max
,
'
submit_workers_max=i
'
=>
\
$submit_workers_max
,
'
pending_adjust=i
'
=>
\
$pending_adjust
,
'
submission_options=s
'
=>
\
$submission_options
,
'
submission_options=s
'
=>
\
$submission_options
,
# worker control
# worker control
...
@@ -163,7 +161,6 @@ sub main {
...
@@ -163,7 +161,6 @@ sub main {
warn
"
Current
"
.
$current_meadow
->
toString
.
"
\n\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
('
TotalRunningWorkersMax
',
$total_running_workers_max
)
if
(
defined
$total_running_workers_max
);
$current_meadow
->
config_set
('
PendingAdjust
',
$pending_adjust
)
if
(
defined
$pending_adjust
);
$current_meadow
->
config_set
('
SubmitWorkersMax
',
$submit_workers_max
)
if
(
defined
$submit_workers_max
);
$current_meadow
->
config_set
('
SubmitWorkersMax
',
$submit_workers_max
)
if
(
defined
$submit_workers_max
);
$current_meadow
->
config_set
('
SubmissionOptions
',
$submission_options
)
if
(
defined
$submission_options
);
$current_meadow
->
config_set
('
SubmissionOptions
',
$submission_options
)
if
(
defined
$submission_options
);
...
@@ -426,7 +423,6 @@ __DATA__
...
@@ -426,7 +423,6 @@ __DATA__
-meadow_type <string> : the desired Meadow class name, such as 'LSF' or 'LOCAL'
-meadow_type <string> : the desired Meadow class name, such as 'LSF' or 'LOCAL'
-total_running_workers_max <num> : max # workers to be running in parallel
-total_running_workers_max <num> : max # workers to be running in parallel
-submit_workers_max <num> : max # workers to create per loop iteration
-submit_workers_max <num> : max # workers to create per loop iteration
-pending_adjust <0|1> : [do not] adjust needed workers by pending workers
-submission_options <string> : passes <string> to the Meadow submission command as <options> (formerly lsf_options)
-submission_options <string> : passes <string> to the Meadow submission command as <options> (formerly lsf_options)
=head2 Worker control
=head2 Worker control
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment