From: Stefan Hanreich <s.hanreich@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH pve-manager v2 14/16] sdn-commit: only reload ifupdown if sdn configuration changed
Date: Fri, 18 Jul 2025 18:26:36 +0200 [thread overview]
Message-ID: <20250718162638.444705-17-s.hanreich@proxmox.com> (raw)
In-Reply-To: <20250718162638.444705-1-s.hanreich@proxmox.com>
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 <s.hanreich@proxmox.com>
Link: https://lore.proxmox.com/20250718123313.208460-4-s.hanreich@proxmox.com
---
bin/pve-sdn-commit | 43 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
diff --git a/bin/pve-sdn-commit b/bin/pve-sdn-commit
index b174f46d9..cf3fd7480 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::Tools;
for (my $i = 0; !PVE::Cluster::check_cfs_quorum(1); $i++) {
print "waiting for pmxcfs mount to appear and get quorate...\n"
@@ -15,6 +20,44 @@ 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 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 0;
+}
+
+if (!sdn_changed()) {
+ print "No changes to SDN configuration detected, skipping reload\n";
+ exit 0;
+}
+
PVE::Network::SDN::commit_config();
PVE::Network::SDN::generate_zone_config();
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
next prev parent reply other threads:[~2025-07-21 9:10 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-18 16:26 [pve-devel] [PATCH common/manager v2 00/18] backport 'proxmox-network-interface-pinning fixes' Stefan Hanreich
2025-07-18 16:26 ` [pve-devel] [PATCH pve-common v2 1/2] network: add ip link and altname helpers Stefan Hanreich
2025-07-18 16:26 ` [pve-devel] [PATCH pve-common v2 2/2] network: add nic prefix to physical nic regex Stefan Hanreich
2025-07-18 16:26 ` [pve-devel] [PATCH pve-manager v2 01/16] cli: add proxmox-network-interface-pinning tool Stefan Hanreich
2025-07-18 16:26 ` [pve-devel] [PATCH pve-manager v2 02/16] services: add pvesdncommit and pvefirewallcommit Stefan Hanreich
2025-07-18 16:26 ` [pve-devel] [PATCH pve-manager v2 03/16] use kebab-case spelling for new SDN and firewall config-commit services Stefan Hanreich
2025-07-18 16:26 ` [pve-devel] [PATCH pve-manager v2 04/16] firewall on-boot commit: report errors if rename fails Stefan Hanreich
2025-07-18 16:26 ` [pve-devel] [PATCH pve-manager v2 05/16] nic pinning: prompt before continuing if connected to TTY Stefan Hanreich
2025-07-18 16:26 ` [pve-devel] [PATCH pve-manager v2 06/16] nic pinning: update description for generate command Stefan Hanreich
2025-07-18 16:26 ` [pve-devel] [PATCH pve-manager v2 07/16] nic pinning: rename 'nic' parameter to 'interface' Stefan Hanreich
2025-07-18 16:26 ` [pve-devel] [PATCH pve-manager v2 08/16] nic pinning: improve some informational and error output wording/formatting Stefan Hanreich
2025-07-18 16:26 ` [pve-devel] [PATCH pve-manager v2 09/16] pve-sdn-commit: fix reloading logic Stefan Hanreich
2025-07-18 16:26 ` [pve-devel] [PATCH pve-manager v2 10/16] proxmox-network-interface-pinning: die on failing to write interfaces Stefan Hanreich
2025-07-18 16:26 ` [pve-devel] [PATCH pve-manager v2 11/16] proxmox-network-interface-pinning: fix pinning after reboot Stefan Hanreich
2025-07-18 16:26 ` [pve-devel] [PATCH pve-manager v2 12/16] network-interface-pinning: avoid comparing undefined string Stefan Hanreich
2025-07-18 16:26 ` [pve-devel] [PATCH pve-manager v2 13/16] {sdn, firewall}-commit: wait for quorum Stefan Hanreich
2025-07-18 16:26 ` Stefan Hanreich [this message]
2025-07-18 16:26 ` [pve-devel] [PATCH pve-manager v2 15/16] network-interface-pinning: fix subsequent invocations Stefan Hanreich
2025-07-18 16:26 ` [pve-devel] [PATCH pve-manager v2 16/16] network-interface-pinning: early exit if nothing to do Stefan Hanreich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250718162638.444705-17-s.hanreich@proxmox.com \
--to=s.hanreich@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox