As the retrieval of the static service stats are not dependent on the location of the guest's config file, there is no need for providing the $service_node and $migration_target arguments anymore.
Signed-off-by: Daniel Kral <[email protected]> --- src/PVE/HA/Resources.pm | 2 +- src/PVE/HA/Resources/PVECT.pm | 2 +- src/PVE/HA/Resources/PVEVM.pm | 2 +- src/PVE/HA/Sim/Resources.pm | 2 +- src/PVE/HA/Usage.pm | 10 ++++------ src/PVE/HA/Usage/Basic.pm | 4 ++-- src/PVE/HA/Usage/Static.pm | 19 +++++++------------ 7 files changed, 17 insertions(+), 24 deletions(-) diff --git a/src/PVE/HA/Resources.pm b/src/PVE/HA/Resources.pm index 68d9d16d..38e0841b 100644 --- a/src/PVE/HA/Resources.pm +++ b/src/PVE/HA/Resources.pm @@ -177,7 +177,7 @@ sub remove_locks { } sub get_static_stats { - my ($class, $haenv, $id, $service_node) = @_; + my ($class, $haenv, $id) = @_; die "implement in subclass"; } diff --git a/src/PVE/HA/Resources/PVECT.pm b/src/PVE/HA/Resources/PVECT.pm index b9ce2ac3..1f4eb2e9 100644 --- a/src/PVE/HA/Resources/PVECT.pm +++ b/src/PVE/HA/Resources/PVECT.pm @@ -160,7 +160,7 @@ sub remove_locks { } sub get_static_stats { - my ($class, $haenv, $id, $service_node) = @_; + my ($class, $haenv, $id) = @_; my $conf = $haenv->get_static_service_stats($id); diff --git a/src/PVE/HA/Resources/PVEVM.pm b/src/PVE/HA/Resources/PVEVM.pm index 303334ba..760259e4 100644 --- a/src/PVE/HA/Resources/PVEVM.pm +++ b/src/PVE/HA/Resources/PVEVM.pm @@ -181,7 +181,7 @@ sub remove_locks { } sub get_static_stats { - my ($class, $haenv, $id, $service_node) = @_; + my ($class, $haenv, $id) = @_; my $conf = $haenv->get_static_service_stats($id); diff --git a/src/PVE/HA/Sim/Resources.pm b/src/PVE/HA/Sim/Resources.pm index ed43373e..1b2bfaaf 100644 --- a/src/PVE/HA/Sim/Resources.pm +++ b/src/PVE/HA/Sim/Resources.pm @@ -138,7 +138,7 @@ sub remove_locks { } sub get_static_stats { - my ($class, $haenv, $id, $service_node) = @_; + my ($class, $haenv, $id) = @_; my $sid = $class->type() . ":$id"; my $hardware = $haenv->hardware(); diff --git a/src/PVE/HA/Usage.pm b/src/PVE/HA/Usage.pm index 92e575cb..1be5fa09 100644 --- a/src/PVE/HA/Usage.pm +++ b/src/PVE/HA/Usage.pm @@ -35,7 +35,7 @@ sub contains_node { # Logs a warning to $haenv upon failure, but does not die. sub add_service_usage_to_node { - my ($self, $nodename, $sid, $service_node, $migration_target) = @_; + my ($self, $nodename, $sid) = @_; die "implement in subclass"; } @@ -49,10 +49,8 @@ sub add_service_usage { my ($current_node, $target_node) = get_used_service_nodes($online_nodes, $service_state, $service_node, $migration_target); - $self->add_service_usage_to_node($current_node, $sid, $service_node, $migration_target) - if $current_node; - $self->add_service_usage_to_node($target_node, $sid, $service_node, $migration_target) - if $target_node; + $self->add_service_usage_to_node($current_node, $sid) if $current_node; + $self->add_service_usage_to_node($target_node, $sid) if $target_node; } sub remove_service_usage { @@ -63,7 +61,7 @@ sub remove_service_usage { # Returns a hash with $nodename => $score pairs. A lower $score is better. sub score_nodes_to_start_service { - my ($self, $sid, $service_node) = @_; + my ($self, $sid) = @_; die "implement in subclass"; } diff --git a/src/PVE/HA/Usage/Basic.pm b/src/PVE/HA/Usage/Basic.pm index 43817bf6..ef9ae3d6 100644 --- a/src/PVE/HA/Usage/Basic.pm +++ b/src/PVE/HA/Usage/Basic.pm @@ -39,7 +39,7 @@ sub contains_node { } sub add_service_usage_to_node { - my ($self, $nodename, $sid, $service_node, $migration_target) = @_; + my ($self, $nodename, $sid) = @_; if ($self->contains_node($nodename)) { $self->{nodes}->{$nodename}->{$sid} = 1; @@ -60,7 +60,7 @@ sub remove_service_usage { } sub score_nodes_to_start_service { - my ($self, $sid, $service_node) = @_; + my ($self, $sid) = @_; my $nodes = $self->{nodes}; diff --git a/src/PVE/HA/Usage/Static.pm b/src/PVE/HA/Usage/Static.pm index 395be871..2304139c 100644 --- a/src/PVE/HA/Usage/Static.pm +++ b/src/PVE/HA/Usage/Static.pm @@ -61,20 +61,15 @@ sub contains_node { } my sub get_service_usage { - my ($self, $sid, $service_node, $migration_target) = @_; + my ($self, $sid) = @_; return $self->{'service-stats'}->{$sid} if $self->{'service-stats'}->{$sid}; my (undef, $type, $id) = $self->{haenv}->parse_sid($sid); my $plugin = PVE::HA::Resources->lookup($type); - my $stats = eval { $plugin->get_static_stats($self->{haenv}, $id, $service_node) }; - if (my $err = $@) { - # config might've already moved during a migration - $stats = eval { $plugin->get_static_stats($self->{haenv}, $id, $migration_target); } - if $migration_target; - die "did not get static service usage information for '$sid' - $err\n" if !$stats; - } + my $stats = eval { $plugin->get_static_stats($self->{haenv}, $id) }; + die "did not get static service usage information for '$sid'\n" if !$stats; my $service_stats = { maxcpu => $stats->{maxcpu} + 0.0, # containers allow non-integer cpulimit @@ -87,12 +82,12 @@ my sub get_service_usage { } sub add_service_usage_to_node { - my ($self, $nodename, $sid, $service_node, $migration_target) = @_; + my ($self, $nodename, $sid) = @_; $self->{'node-services'}->{$nodename}->{$sid} = 1; eval { - my $service_usage = get_service_usage($self, $sid, $service_node, $migration_target); + my $service_usage = get_service_usage($self, $sid); $self->{scheduler}->add_service_usage_to_node($nodename, $sid, $service_usage); }; $self->{haenv}->log('warning', "unable to add service '$sid' usage to node '$nodename' - $@") @@ -111,10 +106,10 @@ sub remove_service_usage { } sub score_nodes_to_start_service { - my ($self, $sid, $service_node) = @_; + my ($self, $sid) = @_; my $score_list = eval { - my $service_usage = get_service_usage($self, $sid, $service_node); + my $service_usage = get_service_usage($self, $sid); $self->{scheduler}->score_nodes_to_start_service($service_usage); }; if (my $err = $@) { -- 2.47.3
