From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 31B781FF170 for ; Thu, 24 Jul 2025 16:16:51 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 691FD3B6D1; Thu, 24 Jul 2025 16:18:11 +0200 (CEST) From: Gabriel Goller To: pve-devel@lists.proxmox.com Date: Thu, 24 Jul 2025 16:17:29 +0200 Message-Id: <20250724141730.468243-5-g.goller@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250724141730.468243-1-g.goller@proxmox.com> References: <20250724141730.468243-1-g.goller@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1753366655567 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.160 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 POISEN_SPAM_PILL 0.1 Meta: its spam POISEN_SPAM_PILL_1 0.1 random spam to be learned in bayes POISEN_SPAM_PILL_3 0.1 random spam to be learned in bayes RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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 network v2 4/5] api: add lock and release endpoints for global configuration lock 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" From: Stefan Hanreich This endpoint exposes the newly introduced global lock functionality via the API. It adds endpoints for acquiring and releasing the lock. Acquiring the lock is as simple as: pvesh create /cluster/sdn/lock The flag 'allow-pending' governs whether the lock should be acquired if there are pending configuration changes. The release endpoint can also be used to forcibly release the lock via CLI without requiring the knowledge of the lock-secret: pvesh delete /cluster/sdn/lock --force 1 Co-authored-by: Gabriel Goller Signed-off-by: Stefan Hanreich --- src/PVE/API2/Network/SDN.pm | 82 +++++++++++++++++++++++++++++++++++++ src/PVE/Network/SDN.pm | 23 +++++++++++ 2 files changed, 105 insertions(+) diff --git a/src/PVE/API2/Network/SDN.pm b/src/PVE/API2/Network/SDN.pm index dc271ec4fbf9..692dec8718f7 100644 --- a/src/PVE/API2/Network/SDN.pm +++ b/src/PVE/API2/Network/SDN.pm @@ -116,6 +116,88 @@ my $create_reload_network_worker = sub { }; __PACKAGE__->register_method({ + name => 'lock', + protected => 1, + path => 'lock', + method => 'POST', + description => "Acquire global lock for SDN configuration", + permissions => { + check => ['perm', '/sdn', ['SDN.Allocate']], + }, + parameters => { + additionalProperties => 0, + properties => { + 'allow-pending' => { + type => 'boolean', + optional => 1, + default => 0, + description => + 'if true, allow acquiring lock even though there are pending changes', + }, + }, + }, + returns => { + type => 'string', + }, + code => sub { + my ($param) = @_; + + return PVE::Network::SDN::lock_sdn_config( + sub { + die "configuration has pending changes" + if !$param->{'allow-pending'} && PVE::Network::SDN::has_pending_changes(); + + return PVE::Network::SDN::create_global_lock(); + }, + "could not acquire lock for SDN config", + ); + }, +}); + +__PACKAGE__->register_method({ + name => 'release_lock', + protected => 1, + path => 'lock', + method => 'DELETE', + description => "Release global lock for SDN configuration", + permissions => { + check => ['perm', '/sdn', ['SDN.Allocate']], + }, + parameters => { + additionalProperties => 0, + properties => { + 'lock-secret' => get_standard_option('pve-sdn-lock-secret'), + 'force' => { + type => 'boolean', + optional => 1, + default => 0, + description => 'if true, allow releasing lock without providing the secret', + }, + }, + }, + returns => { + type => 'null', + }, + code => sub { + my ($param) = @_; + + my $code = sub { + PVE::Network::SDN::delete_global_lock(); + }; + + if ($param->{force}) { + $code->(); + } else { + PVE::Network::SDN::lock_sdn_config( + $code, + "could not release lock", + $param->{'lock-secret'}, + ); + } + }, +}); + +__PACKAGE__->register_method ({ name => 'reload', protected => 1, path => '', diff --git a/src/PVE/Network/SDN.pm b/src/PVE/Network/SDN.pm index adcae175aa2d..59185bfd5a16 100644 --- a/src/PVE/Network/SDN.pm +++ b/src/PVE/Network/SDN.pm @@ -208,6 +208,29 @@ sub commit_config { cfs_write_file($running_cfg, $cfg); } +sub has_pending_changes { + my $running_cfg = PVE::Network::SDN::running_config(); + + # only use configuration files which get written by commit_config here + my $config_files = { + zones => PVE::Network::SDN::Zones::config(), + vnets => PVE::Network::SDN::Vnets::config(), + subnets => PVE::Network::SDN::Subnets::config(), + controllers => PVE::Network::SDN::Controllers::config(), + }; + + for my $config_file (keys %$config_files) { + my $config = $config_files->{$config_file}; + my $pending_config = PVE::Network::SDN::pending_config($running_cfg, $config, $config_file); + + for my $id (keys %{ $pending_config->{ids} }) { + return 1 if $pending_config->{ids}->{$id}->{pending}; + } + } + + return 0; +} + sub generate_lock_secret { my $min = ord('!'); # first printable ascii -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel