From 9304dc09e54eb89597cb46f00c6c51e9dedbac02 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Mon, 18 Nov 2024 21:28:54 +0100 Subject: [PATCH] Revert "schema: add fleecing-images config property" This reverts commit fca0ba5d77d5714dc04a2bed881f03fa3f937147, quoting Fiona in verbatim: > Regarding the patch "schema: add fleecing-images config property", > Fabian off-list suggested using a config section "special:fleecing" > instead of a property, so that it is truly internal-only. If we go for > that, the commit should be reverted. Which approach do you prefer? -- https://lore.proxmox.com/pve-devel/5126c251-64fd-44fe-b1a6-fda9074eb9a1@proxmox.com/ Signed-off-by: Thomas Lamprecht --- PVE/API2/Qemu.pm | 9 --------- PVE/QemuServer.pm | 7 ------- PVE/VZDump/QemuServer.pm | 1 - 3 files changed, 17 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index f5c92b8b..01ad167a 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -1041,9 +1041,6 @@ __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); @@ -1761,9 +1758,6 @@ 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'; @@ -3886,9 +3880,6 @@ __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 ec4b5cf7..154e021f 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -739,13 +739,6 @@ 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 76aaed7a..ed742ed9 100644 --- a/PVE/VZDump/QemuServer.pm +++ b/PVE/VZDump/QemuServer.pm @@ -252,7 +252,6 @@ sub assemble { next; } next if $line =~ m/^lock:/ || $line =~ m/^parent:/; - next if $line =~ m/^fleecing-images:/; print $outfd $line; }