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 2E7F41FF16B for ; Tue, 29 Jul 2025 11:28:53 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 871E2C290; Tue, 29 Jul 2025 11:30:13 +0200 (CEST) From: Gabriel Goller To: pve-devel@lists.proxmox.com Date: Tue, 29 Jul 2025 11:29:31 +0200 Message-Id: <20250729092933.90118-4-g.goller@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250729092933.90118-1-g.goller@proxmox.com> References: <20250729092933.90118-1-g.goller@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1753781369002 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.008 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [sdn.pm] Subject: [pve-devel] [PATCH network v3 3/5] api: add lock token parameter to apply endpoint 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 Committing the configuration now requires a lock on the SDN configuration, which was not required before. This is to prevent concurrent callers from applying the SDN configuration, while the lock is held. If there is no lock set, then this function behaves the same as before. Also add the functionality to automatically release the lock after applying the configuration, for convenience reasons. Co-authored-by: Gabriel Goller Signed-off-by: Stefan Hanreich --- src/PVE/API2/Network/SDN.pm | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/src/PVE/API2/Network/SDN.pm b/src/PVE/API2/Network/SDN.pm index 6645f28b5de1..924c9e4b31a2 100644 --- a/src/PVE/API2/Network/SDN.pm +++ b/src/PVE/API2/Network/SDN.pm @@ -9,7 +9,7 @@ use PVE::JSONSchema qw(get_standard_option); use PVE::RESTHandler; use PVE::RPCEnvironment; use PVE::SafeSyslog; -use PVE::Tools qw(run_command); +use PVE::Tools qw(run_command extract_param); use PVE::Network::SDN; use PVE::API2::Network::SDN::Controllers; @@ -126,6 +126,16 @@ __PACKAGE__->register_method({ }, parameters => { additionalProperties => 0, + properties => { + 'lock-token' => get_standard_option('pve-sdn-lock-token'), + 'release-lock' => { + type => 'boolean', + optional => 1, + default => 1, + description => + 'When lock-token has been provided and configuration successfully commited, release the lock automatically afterwards', + }, + }, }, returns => { type => 'string', @@ -136,10 +146,24 @@ __PACKAGE__->register_method({ my $rpcenv = PVE::RPCEnvironment::get(); my $authuser = $rpcenv->get_user(); - my $previous_config_has_frr = PVE::Network::SDN::running_config_has_frr(); - PVE::Network::SDN::commit_config(); + my $lock_token = extract_param($param, 'lock-token'); + my $release_lock = extract_param($param, 'release-lock'); + + my $previous_config_has_frr; + my $new_config_has_frr; + + PVE::Network::SDN::lock_sdn_config( + sub { + $previous_config_has_frr = PVE::Network::SDN::running_config_has_frr(); + PVE::Network::SDN::commit_config(); + $new_config_has_frr = PVE::Network::SDN::running_config_has_frr(); + + PVE::Network::SDN::delete_global_lock() if $lock_token && $release_lock; + }, + "could not commit SDN config", + $lock_token, + ); - my $new_config_has_frr = PVE::Network::SDN::running_config_has_frr(); my $skip_frr = !($previous_config_has_frr || $new_config_has_frr); my $code = sub { -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel