Add the HA environment's node list information to the feasibility
check/canonicalization stage, which is needed for at least one rule
check for negative resource affinity rules in an upcoming patch, which
verifies that there are enough available nodes to separate the HA
resources on.
Signed-off-by: Daniel Kral <d.k...@proxmox.com>
---
src/PVE/API2/HA/Rules.pm | 5 ++++-
src/PVE/HA/Manager.pm | 3 ++-
src/PVE/HA/Rules.pm | 20 +++++++++++++-------
src/test/test_rules_config.pl | 4 +++-
4 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/src/PVE/API2/HA/Rules.pm b/src/PVE/API2/HA/Rules.pm
index 2e5e382..51e264f 100644
--- a/src/PVE/API2/HA/Rules.pm
+++ b/src/PVE/API2/HA/Rules.pm
@@ -101,7 +101,10 @@ my $check_feasibility = sub {
$rules = $get_full_rules_config->($rules);
- return PVE::HA::Rules->check_feasibility($rules);
+ my $manager_status = PVE::HA::Config::read_manager_status();
+ my $nodes = [keys $manager_status->{node_status}->%*];
+
+ return PVE::HA::Rules->check_feasibility($rules, $nodes);
};
my $assert_feasibility = sub {
diff --git a/src/PVE/HA/Manager.pm b/src/PVE/HA/Manager.pm
index b2fd896..4bf74d2 100644
--- a/src/PVE/HA/Manager.pm
+++ b/src/PVE/HA/Manager.pm
@@ -621,7 +621,8 @@ sub manage {
) {
PVE::HA::Groups::migrate_groups_to_rules($new_rules, $self->{groups},
$sc);
- my $messages = PVE::HA::Rules->canonicalize($new_rules);
+ my $nodes = $self->{ns}->list_nodes();
+ my $messages = PVE::HA::Rules->canonicalize($new_rules, $nodes);
$haenv->log('info', $_) for @$messages;
$self->{rules} = $new_rules;
diff --git a/src/PVE/HA/Rules.pm b/src/PVE/HA/Rules.pm
index 39c349d..3121424 100644
--- a/src/PVE/HA/Rules.pm
+++ b/src/PVE/HA/Rules.pm
@@ -322,26 +322,30 @@ sub get_check_arguments : prototype($$) {
return $global_args;
}
-=head3 $class->check_feasibility($rules)
+=head3 $class->check_feasibility($rules, $nodes)
Checks whether the given C<$rules> are feasible by running all checks, which
were registered with C<L<< register_check()|/$class->register_check(...) >>>,
and returns a hash map of errorneous rules.
+C<$nodes> is a list of the configured cluster nodes.
+
The checks are run in the order in which the rule plugins were registered,
while global checks, i.e. checks between different rule types, are run at the
very last.
=cut
-sub check_feasibility : prototype($$) {
- my ($class, $rules) = @_;
+sub check_feasibility : prototype($$$) {
+ my ($class, $rules, $nodes) = @_;
my $global_errors = {};
my $removable_ruleids = [];
my $global_args = $class->get_check_arguments($rules);
+ $global_args->{nodes} = $nodes;
+
for my $type (@$types, 'global') {
for my $entry (@{ $checkdef->{$type} }) {
my ($check, $collect_errors) = @$entry;
@@ -366,10 +370,12 @@ sub plugin_canonicalize : prototype($$) {
my ($class, $rules) = @_;
}
-=head3 $class->canonicalize($rules)
+=head3 $class->canonicalize($rules, $nodes)
Modifies C<$rules> to contain only feasible rules.
+C<$nodes> is a list of the configured cluster nodes.
+
This is done by running all checks, which were registered with
C<L<< register_check()|/$class->register_check(...) >>> and removing any
rule, which makes the rule set infeasible.
@@ -378,11 +384,11 @@ Returns a list of messages with the reasons why rules
were removed.
=cut
-sub canonicalize : prototype($$) {
- my ($class, $rules) = @_;
+sub canonicalize : prototype($$$) {
+ my ($class, $rules, $nodes) = @_;
my $messages = [];
- my $global_errors = $class->check_feasibility($rules);
+ my $global_errors = $class->check_feasibility($rules, $nodes);
for my $ruleid (keys %$global_errors) {
delete $rules->{ids}->{$ruleid};
diff --git a/src/test/test_rules_config.pl b/src/test/test_rules_config.pl
index 824afed..d49d14f 100755
--- a/src/test/test_rules_config.pl
+++ b/src/test/test_rules_config.pl
@@ -42,6 +42,8 @@ sub check_cfg {
my $raw = PVE::Tools::file_get_contents($cfg_fn);
+ my $nodes = ['node1', 'node2', 'node3'];
+
open(my $LOG, '>', "$outfile");
select($LOG);
$| = 1;
@@ -49,7 +51,7 @@ sub check_cfg {
print "--- Log ---\n";
my $cfg = PVE::HA::Rules->parse_config($cfg_fn, $raw);
PVE::HA::Rules->set_rule_defaults($_) for values %{ $cfg->{ids} };
- my $messages = PVE::HA::Rules->canonicalize($cfg);
+ my $messages = PVE::HA::Rules->canonicalize($cfg, $nodes);
print $_ for @$messages;
print "--- Config ---\n";
{
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
