[pve-devel] [PATCH ha-manager v4 06/19] config: delete services from rules if services are deleted from config

[Daniel Kral <d.kral@proxmox.com>]

Remove HA resources from rules, where these HA resources are used, if
they are removed by delete_service_from_config(...), which is called by
the HA resources' delete API endpoint and possibly external callers,
e.g. if the HA resource is removed externally.

If all of the rules' HA resources have been removed, the rule itself
must be removed as it would result in an erroneous rules config, which
would become user-visible at the next read and parse of the rules
config.

Signed-off-by: Daniel Kral <d.kral@proxmox.com>
---
 src/PVE/HA/Config.pm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/PVE/HA/Config.pm b/src/PVE/HA/Config.pm
index 012ae16d..2e520aab 100644
--- a/src/PVE/HA/Config.pm
+++ b/src/PVE/HA/Config.pm
@@ -360,6 +360,25 @@ sub delete_service_from_config {
         "delete resource failed",
     );
 
+    PVE::HA::Config::lock_ha_domain(
+        sub {
+            my $rules = read_rules_config();
+
+            return if !defined($rules->{ids});
+
+            for my $ruleid (keys %{ $rules->{ids} }) {
+                my $rule_resources = $rules->{ids}->{$ruleid}->{resources} // {};
+
+                delete $rule_resources->{$sid};
+
+                delete $rules->{ids}->{$ruleid} if !%$rule_resources;
+            }
+
+            write_rules_config($rules);
+        },
+        "delete resource from rules failed",
+    );
+
     return !!$res;
 }
 
-- 
2.47.2



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel