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 215068234 for ; Tue, 15 Nov 2022 11:56:00 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 07DEF16E4 for ; Tue, 15 Nov 2022 11:56:00 +0100 (CET) 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 ; Tue, 15 Nov 2022 11:55:58 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 5A0ED43DB1 for ; Tue, 15 Nov 2022 11:55:58 +0100 (CET) From: Stefan Hrdlicka To: pve-devel@lists.proxmox.com Date: Tue, 15 Nov 2022 11:55:24 +0100 Message-Id: <20221115105526.3428334-5-s.hrdlicka@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221115105526.3428334-1-s.hrdlicka@proxmox.com> References: <20221115105526.3428334-1-s.hrdlicka@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: =?UTF-8?Q?0=0A=09?=AWL 0.034 Adjusted score from AWL reputation of From: =?UTF-8?Q?address=0A=09?=BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict =?UTF-8?Q?Alignment=0A=09?=SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF =?UTF-8?Q?Record=0A=09?=SPF_PASS -0.001 SPF: sender matches SPF =?UTF-8?Q?record=0A=09?=URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemuserver.pm, qemu.pm] Subject: [pve-devel] [PATCH V3 qemu-server 4/6] add ignore-storage-errors for removing VM with missing storage 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: Tue, 15 Nov 2022 10:56:00 -0000 Signed-off-by: Stefan Hrdlicka --- PVE/API2/Qemu.pm | 8 ++++++++ PVE/QemuServer.pm | 23 ++++++++++++++++------- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 30348e6..2a0806f 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -1982,6 +1982,13 @@ __PACKAGE__->register_method({ optional => 1, default => 0, }, + 'ignore-storage-errors' => { + type => 'boolean', + description => 'If set, this will ignore errors when trying to remove VM' + . ' storage.', + default => 0, + optional => 1, + }, }, }, returns => { @@ -2038,6 +2045,7 @@ __PACKAGE__->register_method({ $vmid, $skiplock, { lock => 'destroyed' }, $purge_unreferenced, + $param->{'ignore-storage-errors'}, ); PVE::AccessControl::remove_vm_access($vmid); diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 51e9a51..e68d8b4 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -2327,7 +2327,12 @@ sub check_type { } sub destroy_vm { - my ($storecfg, $vmid, $skiplock, $replacement_conf, $purge_unreferenced) = @_; + my ($storecfg, + $vmid, + $skiplock, + $replacement_conf, + $purge_unreferenced, + $ignore_storage_errors) = @_; my $conf = PVE::QemuConfig->load_config($vmid); @@ -2341,10 +2346,10 @@ sub destroy_vm { my $volid = $drive->{file}; return if !$volid || $volid =~ m|^/|; - - die "base volume '$volid' is still in use by linked cloned\n" - if PVE::Storage::volume_is_base_and_used($storecfg, $volid); - + my $result; + eval { $result = PVE::Storage::volume_is_base_and_used($storecfg, $volid) }; + die "Couldn't remove one or more disks: $@\n" if $@ && !$ignore_storage_errors; + die "base volume '$volid' is still in use by linked cloned\n" if $result; }); } @@ -2370,7 +2375,8 @@ sub destroy_vm { include_unused => 1, extra_keys => ['vmstate'], }; - PVE::QemuConfig->foreach_volume_full($conf, $include_opts, $remove_owned_drive); + eval { PVE::QemuConfig->foreach_volume_full($conf, $include_opts, $remove_owned_drive); }; + die "Couldn't remove one or more disks: $@\n" if $@ && !$ignore_storage_errors; for my $snap (values %{$conf->{snapshots}}) { next if !defined($snap->{vmstate}); @@ -2379,7 +2385,10 @@ sub destroy_vm { $remove_owned_drive->('vmstate', $drive); } - PVE::QemuConfig->foreach_volume_full($conf->{pending}, $include_opts, $remove_owned_drive); + eval { + PVE::QemuConfig->foreach_volume_full($conf->{pending}, $include_opts, $remove_owned_drive); + }; + die "Couldn't remove one or more disks: $@\n" if $@ && !$ignore_storage_errors; if ($purge_unreferenced) { # also remove unreferenced disk my $vmdisks = PVE::Storage::vdisk_list($storecfg, undef, $vmid, undef, 'images'); -- 2.30.2