From: Gabriel Goller <g.goller@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH network v3 5/5] api: add rollback endpoint
Date: Tue, 29 Jul 2025 11:29:33 +0200 [thread overview]
Message-ID: <20250729092933.90118-6-g.goller@proxmox.com> (raw)
In-Reply-To: <20250729092933.90118-1-g.goller@proxmox.com>
From: Stefan Hanreich <s.hanreich@proxmox.com>
This adds the functionality of rolling back the pending configuration
to the currently running configuration, resetting all changes made
since last applying the SDN configuration. This is mainly thought as
an escape hatch for failed PDM transactions.
You can invoke the endpoint via CLI:
pvesh create /cluster/sdn/rollback [--lock-token X [--release-lock]]
If a lock is currently held on the configuration and you want to
forcibly rollback, you need to release the lock first via the
lock_release API endpoint.
Co-authored-by: Gabriel Goller <g.goller@proxmox.com>
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
src/PVE/API2/Network/SDN.pm | 57 ++++++++++++++++++++++++++++++++++++-
1 file changed, 56 insertions(+), 1 deletion(-)
diff --git a/src/PVE/API2/Network/SDN.pm b/src/PVE/API2/Network/SDN.pm
index 9e59d0860dfc..7c919025933b 100644
--- a/src/PVE/API2/Network/SDN.pm
+++ b/src/PVE/API2/Network/SDN.pm
@@ -197,7 +197,62 @@ __PACKAGE__->register_method({
},
});
-__PACKAGE__->register_method ({
+__PACKAGE__->register_method({
+ name => 'rollback',
+ protected => 1,
+ path => 'rollback',
+ method => 'POST',
+ description => "Rollback pending changes to SDN configuration",
+ permissions => {
+ check => ['perm', '/sdn', ['SDN.Allocate']],
+ },
+ 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 rollbacked, release the lock automatically afterwards',
+ },
+ },
+ },
+ returns => {
+ type => 'null',
+ },
+ code => sub {
+ my ($param) = @_;
+
+ my $lock_token = extract_param($param, 'lock-token');
+ my $release_lock = extract_param($param, 'release-lock');
+
+ my $rollback = sub {
+ my $running_config = PVE::Network::SDN::running_config();
+
+ PVE::Network::SDN::Zones::write_config($running_config->{zones});
+ PVE::Network::SDN::Vnets::write_config($running_config->{vnets});
+ PVE::Network::SDN::Subnets::write_config($running_config->{subnets});
+ PVE::Network::SDN::Controllers::write_config($running_config->{controllers});
+
+ # if the config hasn't yet been applied after the introduction of
+ # fabrics then the key does not exist in the running config so we
+ # default to an empty hash
+ my $fabrics_config = $running_config->{fabrics}->{ids} // {};
+ my $parsed_fabrics_config = PVE::RS::SDN::Fabrics->running_config($fabrics_config);
+ PVE::Network::SDN::Fabrics::write_config($parsed_fabrics_config);
+
+ PVE::Network::SDN::delete_global_lock() if $lock_token && $release_lock;
+ };
+
+ PVE::Network::SDN::lock_sdn_config(
+ $rollback, "could not rollback SDN configuration", $lock_token,
+ );
+ },
+});
+
+__PACKAGE__->register_method({
name => 'reload',
protected => 1,
path => '',
--
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-29 9:29 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-29 9:29 [pve-devel] [PATCH network v3 0/5] Add global locking and configuration rollback to SDN configuration Gabriel Goller
2025-07-29 9:29 ` [pve-devel] [PATCH network v3 1/5] sdn: add global lock for configuration Gabriel Goller
2025-07-29 9:29 ` [pve-devel] [PATCH network v3 2/5] api: add lock-token parameter to all api calls Gabriel Goller
2025-07-29 9:29 ` [pve-devel] [PATCH network v3 3/5] api: add lock token parameter to apply endpoint Gabriel Goller
2025-07-29 9:29 ` [pve-devel] [PATCH network v3 4/5] api: add lock and release endpoints for global configuration lock Gabriel Goller
2025-07-29 9:29 ` Gabriel Goller [this message]
2025-07-29 11:02 ` [pve-devel] applied-series: [PATCH network v3 0/5] Add global locking and configuration rollback to SDN configuration Thomas Lamprecht
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=20250729092933.90118-6-g.goller@proxmox.com \
--to=g.goller@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