diff --git a/modules/Bio/EnsEMBL/Hive/Limiter.pm b/modules/Bio/EnsEMBL/Hive/Limiter.pm index cce455a4ef68e5f64f0461f33e6670a662852055..f443146c1cba288d5c8638c6a9e3f05d56fee500 100644 --- a/modules/Bio/EnsEMBL/Hive/Limiter.pm +++ b/modules/Bio/EnsEMBL/Hive/Limiter.pm @@ -39,6 +39,8 @@ sub new { my $self = bless {}, $class; $self->description( $description ); + + $self->original_capacity( $available_capacity ); $self->available_capacity( $available_capacity ); # we fix the multiplier at 1 for direct limiters, but expect it to be (re)set later by reciprocal limiters: @@ -58,6 +60,16 @@ sub description { } +sub original_capacity { + my $self = shift @_; + + if(@_) { + $self->{_original_capacity} = shift @_; + } + return $self->{_original_capacity}; +} + + sub available_capacity { my $self = shift @_; diff --git a/modules/Bio/EnsEMBL/Hive/Scheduler.pm b/modules/Bio/EnsEMBL/Hive/Scheduler.pm index aa851795bd8b8a17fcafac8e1c799c871f950b12..df6e7cdcbcda2c2e5b54a9bcbd17bf5efc8dbb86 100644 --- a/modules/Bio/EnsEMBL/Hive/Scheduler.pm +++ b/modules/Bio/EnsEMBL/Hive/Scheduler.pm @@ -180,7 +180,7 @@ sub schedule_workers { foreach my $analysis_stats (@stats_sorted_by_suitability) { if( $submit_capacity_limiter->reached ) { if( $analysis_id2rc_name ) { # only add this message when scheduling and not during a Worker's specialization - push @log_buffer, "Submission capacity ($submit_capacity) has been reached."; + push @log_buffer, "Submission capacity (=".$submit_capacity_limiter->original_capacity.") has been reached."; } last; } @@ -190,7 +190,7 @@ sub schedule_workers { my $this_meadow_type = $analysis->meadow_type || $default_meadow_type; if( $meadow_capacity_limiter_hashed_by_type && $meadow_capacity_limiter_hashed_by_type->{$this_meadow_type}->reached ) { - push @log_buffer, "Capacity of '$this_meadow_type' Meadow has been reached, skipping Analysis '$logic_name'."; + push @log_buffer, "Total capacity of '$this_meadow_type' Meadow (=".$meadow_capacity_limiter_hashed_by_type->{$this_meadow_type}->original_capacity.") has been reached, skipping Analysis '$logic_name'."; next; }