From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <f.ebner@proxmox.com>
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 43A59EE8F
for <pve-devel@lists.proxmox.com>; Tue, 13 Dec 2022 14:08:09 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 2C9A71F96F
for <pve-devel@lists.proxmox.com>; Tue, 13 Dec 2022 14:08:09 +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 <pve-devel@lists.proxmox.com>; Tue, 13 Dec 2022 14:08:08 +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 607534265E
for <pve-devel@lists.proxmox.com>; Tue, 13 Dec 2022 14:08:08 +0100 (CET)
Message-ID: <aff3065a-b59c-214e-58aa-d1062160ef19@proxmox.com>
Date: Tue, 13 Dec 2022 14:08:07 +0100
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
Thunderbird/102.5.0
Content-Language: en-US
To: pve-devel@lists.proxmox.com, Stefan Hrdlicka <s.hrdlicka@proxmox.com>
References: <20221125144008.2988072-1-s.hrdlicka@proxmox.com>
<20221125144008.2988072-3-s.hrdlicka@proxmox.com>
From: Fiona Ebner <f.ebner@proxmox.com>
In-Reply-To: <20221125144008.2988072-3-s.hrdlicka@proxmox.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.027 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
NICE_REPLY_A -0.001 Looks like a legit reply (A)
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
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: Re: [pve-devel] [PATCH V4 pve-container 2/7] 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 <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Tue, 13 Dec 2022 13:08:09 -0000
Am 25.11.22 um 15:40 schrieb Stefan Hrdlicka:
> 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 <s.hrdlicka@proxmox.com>
> ---
> 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});
Nit: I'd prefer my ($storeid, undef) to avoid introducing an unused variable
$conf->{opt} is not necessarily a volume ID. That's only true with the
current format for unused entries. Please use $class->parse_volume() to
get the volume ID first.
> 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);
Please also change the parameter to is_volume_in_use() to use $volid
rather than $conf->{opt} (should be a separate patch).
> }