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 F2D331FF17A for ; Fri, 18 Jul 2025 14:32:45 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0019C1DB87; Fri, 18 Jul 2025 14:33:47 +0200 (CEST) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Fri, 18 Jul 2025 14:33:13 +0200 Message-Id: <20250718123313.208460-4-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250718123313.208460-1-s.hanreich@proxmox.com> References: <20250718123313.208460-1-s.hanreich@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.208 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 KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pve-devel] [PATCH pve-manager 3/3] sdn-commit: only reload ifupdown if sdn configuration changed 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" Check for any changes between the running config and the currently applied config and guard against executing pve-sdn-commit if the configuration is unchanged. Signed-off-by: Stefan Hanreich --- bin/pve-sdn-commit | 65 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/bin/pve-sdn-commit b/bin/pve-sdn-commit index 7536608d6..d75e14440 100644 --- a/bin/pve-sdn-commit +++ b/bin/pve-sdn-commit @@ -7,6 +7,11 @@ use Time::HiRes qw(usleep); use PVE::Cluster; use PVE::Network::SDN; +use PVE::Network::SDN::Zones; +use PVE::Network::SDN::Vnets; +use PVE::Network::SDN::Subnets; +use PVE::Network::SDN::Controllers; +use PVE::Network::SDN::Fabrics; use PVE::Tools; for (my $i = 0; !PVE::Cluster::check_cfs_quorum(1); $i++) { @@ -16,6 +21,66 @@ for (my $i = 0; !PVE::Cluster::check_cfs_quorum(1); $i++) { usleep(100 * 1000); } +sub has_pending_changes { + my ($pending_config) = @_; + + for my $entity (values $pending_config->{ids}->%*) { + return 1 if $entity->{state}; + } + + return 0; +} + +sub fabrics_changed { + my $current_config = PVE::Network::SDN::Fabrics::config(); + my $running_config = PVE::Network::SDN::Fabrics::config(1); + + my ($running_fabrics, $running_nodes) = $running_config->list_all(); + my ($current_fabrics, $current_nodes) = $current_config->list_all(); + + my $pending_fabrics = PVE::Network::SDN::pending_config( + { fabrics => { ids => $running_fabrics } }, + { ids => $current_fabrics }, + 'fabrics', + ); + + my $pending_nodes = PVE::Network::SDN::pending_config( + { nodes => { ids => $running_nodes } }, + { ids => $current_nodes }, + 'nodes', + ); + + return has_pending_changes($pending_fabrics) || has_pending_changes($pending_nodes); +} + +sub sdn_changed { + my $running_config = PVE::Network::SDN::running_config(); + + my $configs = { + 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 $type (keys $configs->%*) { + my $pending_config = PVE::Network::SDN::pending_config( + $running_config, + $configs->{$type}, + $type, + ); + + return 1 if has_pending_changes($pending_config); + } + + return fabrics_changed(); +} + +if (!sdn_changed()) { + print "No changes to SDN configuration detected, skipping reload\n"; + exit 0; +} + my $previous_config_has_frr = PVE::Network::SDN::running_config_has_frr(); PVE::Network::SDN::commit_config(); -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel