Commit a7f464f8 authored by Leo Gordon's avatar Leo Gordon
Browse files

removed PendingAdjust option from beekeeper and config file as it never really needs to be unset

parent 80eaddf3
......@@ -2,7 +2,6 @@
"Meadow" : { # configure Meadow-specific options here:
"LSF" : {
"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
"farm2" : {
"SubmitWorkersMax" : 50, # if set, provides a cut-off on the number of workers being submitted each iteration
......
......@@ -816,7 +816,7 @@ sub schedule_workers_resync_if_necessary {
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 $meadow_limit = ($meadow->can('count_running_workers') and defined($meadow->config_get('TotalRunningWorkersMax'))) ? $meadow->config_get('TotalRunningWorkersMax') - $meadow->count_running_workers : undef;
......
......@@ -30,7 +30,6 @@ sub main {
my $local = 0;
my $show_failed_jobs = 0;
my $meadow_type = undef;
my $pending_adjust = undef;
my $submit_workers_max = undef;
my $total_running_workers_max = undef;
my $submission_options = undef;
......@@ -76,7 +75,6 @@ sub main {
'meadow_type=s' => \$meadow_type,
'total_running_workers_max=i' => \$total_running_workers_max,
'submit_workers_max=i' => \$submit_workers_max,
'pending_adjust=i' => \$pending_adjust,
'submission_options=s' => \$submission_options,
# worker control
......@@ -163,7 +161,6 @@ sub main {
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);
$current_meadow->config_set('SubmitWorkersMax', $submit_workers_max) if(defined $submit_workers_max);
$current_meadow->config_set('SubmissionOptions', $submission_options) if(defined $submission_options);
......@@ -426,7 +423,6 @@ __DATA__
-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
-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)
=head2 Worker control
......
Markdown is supported
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