configs: add locking helpers

to allow some level of safe concurrent config modification, instead of
the current free for all.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm
index 250a642a58eb93f5c426ab7a4ad917196aecff87..84f71d6fcfebc161c97043a3bf0c69e25d1906d8 100644 (file)
--- a/src/PVE/Firewall.pm
+++ b/src/PVE/Firewall.pm
@@ -3053,6 +3053,8 @@ sub generic_fw_config_parser {
     return $res;
 }
 
     return $res;
 }
 

+# this is only used to prevent concurrent runs of rule compilation/application
+# see lock_*_conf for cfs locks protectiong config modification

 sub run_locked {
     my ($code, @param) = @_;
 
 sub run_locked {
     my ($code, @param) = @_;
 


@@ -3101,6 +3103,18 @@ sub read_local_vm_config {
     return $vmdata;
 };
 
     return $vmdata;
 };
 

+sub lock_vmfw_conf {
+    my ($vmid, $timeout, $code, @param) = @_;
+
+    die "can't lock VM firewall config for undefined VMID\n"
+       if !defined($vmid);
+
+    my $res = PVE::Cluster::cfs_lock_firewall("vm-$vmid", $timeout, $code, @param);
+    die $@ if $@;
+
+    return $res;
+}
+

 sub load_vmfw_conf {
     my ($cluster_conf, $rule_env, $vmid, $dir) = @_;
 
 sub load_vmfw_conf {
     my ($cluster_conf, $rule_env, $vmid, $dir) = @_;
 


@@ -3448,6 +3462,15 @@ my $set_global_log_ratelimit = sub {
     }
 };
 
     }
 };
 

+sub lock_clusterfw_conf {
+    my ($timeout, $code, @param) = @_;
+
+    my $res = PVE::Cluster::cfs_lock_firewall("cluster", $timeout, $code, @param);
+    die $@ if $@;
+
+    return $res;
+}
+

 sub load_clusterfw_conf {
     my ($filename) = @_;
 
 sub load_clusterfw_conf {
     my ($filename) = @_;
 


@@ -3511,6 +3534,15 @@ sub save_clusterfw_conf {
     }
 }
 
     }
 }
 

+sub lock_hostfw_conf {
+    my ($timeout, $code, @param) = @_;
+
+    my $res = PVE::Cluster::cfs_lock_firewall("host-$nodename", $timeout, $code, @param);
+    die $@ if $@;
+
+    return $res;
+}
+

 sub load_hostfw_conf {
     my ($cluster_conf, $filename) = @_;
 
 sub load_hostfw_conf {
     my ($cluster_conf, $filename) = @_;