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 2B8A7925E0 for ; Mon, 12 Sep 2022 17:31:38 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DE9887B39 for ; Mon, 12 Sep 2022 17:31:07 +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 ; Mon, 12 Sep 2022 17:31:06 +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 F084743840 for ; Mon, 12 Sep 2022 17:25:29 +0200 (CEST) From: Stefan Hrdlicka To: pve-devel@lists.proxmox.com Date: Mon, 12 Sep 2022 17:25:04 +0200 Message-Id: <20220912152507.3498492-6-s.hrdlicka@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220912152507.3498492-1-s.hrdlicka@proxmox.com> References: <20220912152507.3498492-1-s.hrdlicka@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.062 Adjusted score from AWL reputation of From: address 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 Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH V2 qemu-server 5/8] add ignore-storage-errors attribute 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: Mon, 12 Sep 2022 15:31:38 -0000 Signed-off-by: Stefan Hrdlicka --- PVE/API2/Qemu.pm | 8 ++++++++ PVE/QemuServer.pm | 27 ++++++++++++++++++++------- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index d9ef201..e51f777 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -1852,6 +1852,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 => { @@ -1908,6 +1915,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 c706653..4900e15 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -2295,7 +2295,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); @@ -2309,10 +2314,12 @@ 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; }); } @@ -2338,7 +2345,10 @@ 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}); @@ -2347,7 +2357,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