As the service stats repository includes non-HA resources as well, use it to add the static usage stats of these running, non-HA resources to the scheduler.
Signed-off-by: Daniel Kral <[email protected]> --- src/PVE/HA/Env.pm | 6 ++++++ src/PVE/HA/Env/PVE2.pm | 6 ++++++ src/PVE/HA/Manager.pm | 15 ++++++++++++++- src/PVE/HA/Sim/Env.pm | 6 ++++++ src/PVE/HA/Sim/Hardware.pm | 6 ++++++ src/PVE/HA/Usage.pm | 2 +- src/PVE/HA/Usage/Basic.pm | 2 +- src/PVE/HA/Usage/Static.pm | 5 +---- 8 files changed, 41 insertions(+), 7 deletions(-) diff --git a/src/PVE/HA/Env.pm b/src/PVE/HA/Env.pm index 6843cb30..ed8c8c83 100644 --- a/src/PVE/HA/Env.pm +++ b/src/PVE/HA/Env.pm @@ -300,6 +300,12 @@ sub get_datacenter_settings { return $self->{plug}->get_datacenter_settings(); } +sub get_basic_service_stats { + my ($self) = @_; + + return $self->{plug}->get_basic_service_stats(); +} + sub get_static_service_stats { my ($self) = @_; diff --git a/src/PVE/HA/Env/PVE2.pm b/src/PVE/HA/Env/PVE2.pm index c43cf3ca..d5c20460 100644 --- a/src/PVE/HA/Env/PVE2.pm +++ b/src/PVE/HA/Env/PVE2.pm @@ -533,6 +533,12 @@ my sub get_cluster_service_stats { return $stats; } +sub get_basic_service_stats { + my ($self) = @_; + + return get_cluster_service_stats(); +} + sub get_static_service_stats { my ($self) = @_; diff --git a/src/PVE/HA/Manager.pm b/src/PVE/HA/Manager.pm index 57fd0017..f9dec661 100644 --- a/src/PVE/HA/Manager.pm +++ b/src/PVE/HA/Manager.pm @@ -245,13 +245,15 @@ sub recompute_online_node_usage { my $online_nodes = $self->{ns}->list_online_nodes(); + my $service_stats; my $online_node_usage; if (my $mode = $self->{crs}->{scheduler}) { if ($mode eq 'static') { if ($have_static_scheduling) { $online_node_usage = eval { - my $scheduler = PVE::HA::Usage::Static->new($haenv); + $service_stats = $haenv->get_static_service_stats(); + my $scheduler = PVE::HA::Usage::Static->new($haenv, $service_stats); $scheduler->add_node($_) for $online_nodes->@*; return $scheduler; }; @@ -271,6 +273,7 @@ sub recompute_online_node_usage { # fallback to the basic algorithm in any case if (!$online_node_usage) { + $service_stats = $haenv->get_basic_service_stats(); $online_node_usage = PVE::HA::Usage::Basic->new($haenv); $online_node_usage->add_node($_) for $online_nodes->@*; } @@ -281,6 +284,16 @@ sub recompute_online_node_usage { $online_node_usage->add_service_usage($sid, $sd->{state}, $sd->{node}, $sd->{target}); } + # add remaining non-HA resources to online node usage + for my $sid (sort keys %$service_stats) { + next if $self->{ss}->{$sid}; + + my ($node, $state) = $service_stats->{$sid}->@{qw(node state)}; + + # the migration target is not known for non-HA resources + $online_node_usage->add_service_usage($sid, $state, $node, undef); + } + $self->{online_node_usage} = $online_node_usage; } diff --git a/src/PVE/HA/Sim/Env.pm b/src/PVE/HA/Sim/Env.pm index 0e3b02e5..ad51245c 100644 --- a/src/PVE/HA/Sim/Env.pm +++ b/src/PVE/HA/Sim/Env.pm @@ -488,6 +488,12 @@ sub get_datacenter_settings { }; } +sub get_basic_service_stats { + my ($self) = @_; + + return $self->{hardware}->get_basic_service_stats(); +} + sub get_static_service_stats { my ($self) = @_; diff --git a/src/PVE/HA/Sim/Hardware.pm b/src/PVE/HA/Sim/Hardware.pm index 4b4a187f..37aa28f7 100644 --- a/src/PVE/HA/Sim/Hardware.pm +++ b/src/PVE/HA/Sim/Hardware.pm @@ -1077,6 +1077,12 @@ my sub get_cluster_service_stats { return $stats; } +sub get_basic_service_stats { + my ($self) = @_; + + return get_cluster_service_stats($self); +} + sub get_static_service_stats { my ($self) = @_; diff --git a/src/PVE/HA/Usage.pm b/src/PVE/HA/Usage.pm index 1be5fa09..9f19a82b 100644 --- a/src/PVE/HA/Usage.pm +++ b/src/PVE/HA/Usage.pm @@ -4,7 +4,7 @@ use strict; use warnings; sub new { - my ($class, $haenv) = @_; + my ($class, $haenv, $service_stats) = @_; die "implement in subclass"; } diff --git a/src/PVE/HA/Usage/Basic.pm b/src/PVE/HA/Usage/Basic.pm index ef9ae3d6..2584727b 100644 --- a/src/PVE/HA/Usage/Basic.pm +++ b/src/PVE/HA/Usage/Basic.pm @@ -6,7 +6,7 @@ use warnings; use base qw(PVE::HA::Usage); sub new { - my ($class, $haenv) = @_; + my ($class, $haenv, $service_stats) = @_; return bless { nodes => {}, diff --git a/src/PVE/HA/Usage/Static.pm b/src/PVE/HA/Usage/Static.pm index 98752691..c8460fd7 100644 --- a/src/PVE/HA/Usage/Static.pm +++ b/src/PVE/HA/Usage/Static.pm @@ -9,14 +9,11 @@ use PVE::RS::ResourceScheduling::Static; use base qw(PVE::HA::Usage); sub new { - my ($class, $haenv) = @_; + my ($class, $haenv, $service_stats) = @_; my $node_stats = eval { $haenv->get_static_node_stats() }; die "did not get static node usage information - $@" if $@; - my $service_stats = eval { $haenv->get_static_service_stats() }; - die "did not get static service usage information - $@" if $@; - my $scheduler = eval { PVE::RS::ResourceScheduling::Static->new(); }; die "unable to initialize static scheduling - $@" if $@; -- 2.47.3
