From fca0ba5d77d5714dc04a2bed881f03fa3f937147 Mon Sep 17 00:00:00 2001 From: Fiona Ebner Date: Mon, 11 Nov 2024 14:54:33 +0100 Subject: [PATCH] schema: add fleecing-images config property MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to be used internally to record volume IDs of fleecing images allocated during backup. Suggested-by: Fabian Grünbichler Signed-off-by: Fiona Ebner --- PVE/API2/Qemu.pm | 9 +++++++++ PVE/QemuServer.pm | 7 +++++++ PVE/VZDump/QemuServer.pm | 1 + 3 files changed, 17 insertions(+) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 1c3cb271..19af6bf9 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -968,6 +968,9 @@ __PACKAGE__->register_method({ $param->{cpuunits} = PVE::CGroup::clamp_cpu_shares($param->{cpuunits}) if defined($param->{cpuunits}); # clamp value depending on cgroup version + raise_param_exc({ 'fleecing-images' => "Cannot set option - for internal use only." }) + if $param->{'fleecing-images'}; + PVE::Cluster::check_cfs_quorum(); my $filename = PVE::QemuConfig->config_file($vmid); @@ -1681,6 +1684,9 @@ my $update_vm_api = sub { push @paramarr, "-$key", $value; } + raise_param_exc({ 'fleecing-images' => "Cannot set option - for internal use only." }) + if $param->{'fleecing-images'}; + my $skiplock = extract_param($param, 'skiplock'); raise_param_exc({ skiplock => "Only root may use this option." }) if $skiplock && $authuser ne 'root@pam'; @@ -3795,6 +3801,9 @@ __PACKAGE__->register_method({ next if $opt eq 'snapshots' || $opt eq 'parent' || $opt eq 'snaptime' || $opt eq 'vmstate' || $opt eq 'snapstate'; + # left-overs, not cloned + next if $opt eq 'fleecing-images'; + # no need to copy unused images, because VMID(owner) changes anyways next if $opt =~ m/^unused\d+$/; diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 591c01bf..c120af43 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -733,6 +733,13 @@ EODESCR description => "List of host cores used to execute guest processes, for example: 0,5,8-11", optional => 1, }, + 'fleecing-images' => { + type => 'string', + format => 'pve-volume-id-list', + description => "For internal use only. List of fleecing images allocated during backup." + ." If no backup is running, these are left-overs that failed to be removed.", + optional => 1, + }, }; my $cicustom_fmt = { diff --git a/PVE/VZDump/QemuServer.pm b/PVE/VZDump/QemuServer.pm index ed742ed9..76aaed7a 100644 --- a/PVE/VZDump/QemuServer.pm +++ b/PVE/VZDump/QemuServer.pm @@ -252,6 +252,7 @@ sub assemble { next; } next if $line =~ m/^lock:/ || $line =~ m/^parent:/; + next if $line =~ m/^fleecing-images:/; print $outfd $line; }