From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 4C9DE94BD8 for ; Thu, 11 Apr 2024 11:33:22 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5DC801E0AA for ; Thu, 11 Apr 2024 11:33:21 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 11 Apr 2024 11:33:18 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 7C86C44A56 for ; Thu, 11 Apr 2024 11:33:16 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Thu, 11 Apr 2024 11:29:39 +0200 Message-Id: <20240411092943.57377-19-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240411092943.57377-1-f.ebner@proxmox.com> References: <20240411092943.57377-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.072 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [RFC qemu-server v3 18/22] schema: add fleecing-images config property 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: , X-List-Received-Date: Thu, 11 Apr 2024 09:33:22 -0000 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 f3ce83d6..e1a3a19f 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -942,6 +942,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); @@ -1660,6 +1663,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'; @@ -3747,6 +3753,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 4a57b8b8..61804ae6 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -729,6 +729,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 8c97ee62..8a44a1fd 100644 --- a/PVE/VZDump/QemuServer.pm +++ b/PVE/VZDump/QemuServer.pm @@ -249,6 +249,7 @@ sub assemble { next; } next if $line =~ m/^lock:/ || $line =~ m/^parent:/; + next if $line =~ m/^fleecing-images:/; print $outfd $line; } -- 2.39.2