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 93A2282C3 for ; Tue, 15 Nov 2022 11:56:29 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7493116CE for ; Tue, 15 Nov 2022 11:55:59 +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 F083E43E26 for ; Tue, 15 Nov 2022 11:55:57 +0100 (CET) From: Stefan Hrdlicka To: pve-devel@lists.proxmox.com Date: Tue, 15 Nov 2022 11:55:22 +0100 Message-Id: <20221115105526.3428334-3-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.035 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. [config.pm] Subject: [pve-devel] [PATCH V3 pve-container 2/6] adapt behavior for detaching/removing a mount point 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:29 -0000 detach of a mount point with a removed underlying storage causes it to be labeled as a an 'unused disk' remove of a 'unused disk' with a removed underlying storage causes it to be removed from the configuration Signed-off-by: Stefan Hrdlicka --- src/PVE/LXC/Config.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/PVE/LXC/Config.pm b/src/PVE/LXC/Config.pm index b1f779b..e8fbd86 100644 --- a/src/PVE/LXC/Config.pm +++ b/src/PVE/LXC/Config.pm @@ -1421,13 +1421,17 @@ sub vmconfig_apply_pending { foreach my $opt (sort keys %$pending_delete_hash) { next if $selection && !$selection->{$opt}; eval { + my ($storeid, $volname) = PVE::Storage::parse_volume_id($conf->{$opt}); if ($opt =~ m/^mp(\d+)$/) { my $mp = $class->parse_volume($opt, $conf->{$opt}); if ($mp->{type} eq 'volume') { $class->add_unused_volume($conf, $mp->{volume}) if !$class->is_volume_in_use($conf, $conf->{$opt}, 1, 1); } - } elsif ($opt =~ m/^unused(\d+)$/) { + } elsif ( + $opt =~ m/^unused(\d+)$/ + && PVE::Storage::storage_config($storecfg, $storeid, 1) + ) { PVE::LXC::delete_mountpoint_volume($storecfg, $vmid, $conf->{$opt}) if !$class->is_volume_in_use($conf, $conf->{$opt}, 1, 1); } -- 2.30.2