From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 97B8C1FF170 for ; Thu, 21 Aug 2025 16:37:50 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 662782D422; Thu, 21 Aug 2025 16:37:44 +0200 (CEST) From: Daniel Kral To: pve-devel@lists.proxmox.com Date: Thu, 21 Aug 2025 16:35:40 +0200 Message-ID: <20250821143705.256562-8-d.kral@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250821143705.256562-1-d.kral@proxmox.com> References: <20250821143705.256562-1-d.kral@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1755787029214 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.013 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH ha-manager 07/18] rename rule's canonicalize stage to transform stage X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" The name 'canonicalize' was chosen when the actual goal was to transform the rules in a canonical form for the scheduler, but as development went on they are used to transform $rules and induce new rules from $rules, so 'canonicalize' is not the right term anymore. 'transform' is chosen because it's broad enough for future use but still conveys what is done with the $rules. Signed-off-by: Daniel Kral --- src/PVE/HA/Config.pm | 2 +- src/PVE/HA/Manager.pm | 2 +- src/PVE/HA/Rules.pm | 18 +++++++++--------- src/PVE/HA/Rules/ResourceAffinity.pm | 4 ++-- src/test/test_rules_config.pl | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/PVE/HA/Config.pm b/src/PVE/HA/Config.pm index b2ef26aa..bd87a0ab 100644 --- a/src/PVE/HA/Config.pm +++ b/src/PVE/HA/Config.pm @@ -237,7 +237,7 @@ sub read_and_check_effective_rules_config { PVE::HA::Groups::migrate_groups_to_rules($rules, $groups, $resources); - PVE::HA::Rules->canonicalize($rules, $nodes); + PVE::HA::Rules->transform($rules, $nodes); return $rules; } diff --git a/src/PVE/HA/Manager.pm b/src/PVE/HA/Manager.pm index 92a2c05e..12d3c0e8 100644 --- a/src/PVE/HA/Manager.pm +++ b/src/PVE/HA/Manager.pm @@ -754,7 +754,7 @@ sub manage { PVE::HA::Groups::migrate_groups_to_rules($new_rules, $self->{groups}, $sc); my $nodes = $self->{ns}->list_nodes(); - my $messages = PVE::HA::Rules->canonicalize($new_rules, $nodes); + my $messages = PVE::HA::Rules->transform($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 784f2d36..c81b1525 100644 --- a/src/PVE/HA/Rules.pm +++ b/src/PVE/HA/Rules.pm @@ -360,7 +360,7 @@ sub check_feasibility : prototype($$$) { return $global_errors; } -=head3 $class->plugin_canonicalize($rules) +=head3 $class->plugin_transform($rules) B Can be implemented in the I. @@ -368,11 +368,11 @@ Modifies the C<$rules> to a plugin-specific canonical form. =cut -sub plugin_canonicalize : prototype($$) { +sub plugin_transform : prototype($$) { my ($class, $rules) = @_; } -=head3 $class->canonicalize($rules, $nodes) +=head3 $class->transform($rules, $nodes) Modifies C<$rules> to contain only feasible rules. @@ -386,7 +386,7 @@ Returns a list of messages with the reasons why rules were removed. =cut -sub canonicalize : prototype($$$) { +sub transform : prototype($$$) { my ($class, $rules, $nodes) = @_; my $messages = []; @@ -407,11 +407,11 @@ sub canonicalize : prototype($$$) { for my $type (@$types) { my $plugin = $class->lookup($type); - eval { $plugin->plugin_canonicalize($rules) }; - next if $@; # plugin doesn't implement plugin_canonicalize(...) + eval { $plugin->plugin_transform($rules) }; + next if $@; # plugin doesn't implement plugin_transform(...) } - $class->global_canonicalize($rules); + $class->global_transform($rules); return $messages; } @@ -709,7 +709,7 @@ __PACKAGE__->register_check( }, ); -=head1 INTER-PLUGIN RULE CANONICALIZATION HELPERS +=head1 INTER-PLUGIN RULE TRANSFORMATION HELPERS =cut @@ -750,7 +750,7 @@ sub create_implicit_positive_resource_affinity_node_affinity_rules { } } -sub global_canonicalize { +sub global_transform { my ($class, $rules) = @_; my $args = $class->get_check_arguments($rules); diff --git a/src/PVE/HA/Rules/ResourceAffinity.pm b/src/PVE/HA/Rules/ResourceAffinity.pm index e9b368a4..947e1580 100644 --- a/src/PVE/HA/Rules/ResourceAffinity.pm +++ b/src/PVE/HA/Rules/ResourceAffinity.pm @@ -251,7 +251,7 @@ __PACKAGE__->register_check( }, ); -=head1 RESOURCE AFFINITY RULE CANONICALIZATION HELPERS +=head1 RESOURCE AFFINITY RULE TRANSFORMATION HELPERS =cut @@ -381,7 +381,7 @@ sub create_implicit_negative_resource_affinity_rules { } } -sub plugin_canonicalize { +sub plugin_transform { my ($class, $rules) = @_; my $args = $class->get_plugin_check_arguments($rules); diff --git a/src/test/test_rules_config.pl b/src/test/test_rules_config.pl index c2a7af43..3c2dac4b 100755 --- a/src/test/test_rules_config.pl +++ b/src/test/test_rules_config.pl @@ -53,7 +53,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, $nodes); + my $messages = PVE::HA::Rules->transform($cfg, $nodes); print $_ for @$messages; print "--- Config ---\n"; { -- 2.47.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel