From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com, Stefan Hrdlicka <s.hrdlicka@proxmox.com>
Subject: Re: [pve-devel] [PATCH V4 pve-container 2/7] adapt behavior for detaching/removing a mount point
Date: Tue, 13 Dec 2022 14:08:07 +0100 [thread overview]
Message-ID: <aff3065a-b59c-214e-58aa-d1062160ef19@proxmox.com> (raw)
In-Reply-To: <20221125144008.2988072-3-s.hrdlicka@proxmox.com>
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).
> }
next prev parent reply other threads:[~2022-12-13 13:08 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-25 14:40 [pve-devel] [PATCH SERIES V4 pve-container/qemu-server/pve-manager 0/7] fix #3711 & adapt drive detach/remove behavior Stefan Hrdlicka
2022-11-25 14:40 ` [pve-devel] [PATCH V4 pve-container 1/7] fix #3711: optionally allow CT deletion to complete on disk volume removal errors Stefan Hrdlicka
2022-12-13 13:07 ` Fiona Ebner
2022-11-25 14:40 ` [pve-devel] [PATCH V4 pve-container 2/7] adapt behavior for detaching/removing a mount point Stefan Hrdlicka
2022-12-13 13:08 ` Fiona Ebner [this message]
2022-11-25 14:40 ` [pve-devel] [PATCH V4 pve-container 3/7] add linked clone check for LXC container template deletion Stefan Hrdlicka
2022-12-13 13:08 ` Fiona Ebner
2022-11-25 14:40 ` [pve-devel] [PATCH V4 pve-container 4/7] cleanup: remove spaces from empty lines Stefan Hrdlicka
2022-11-25 14:40 ` [pve-devel] [PATCH V4 qemu-server 5/7] ignore PVE::Storage::path errors when deleting VMs Stefan Hrdlicka
2022-12-13 13:08 ` Fiona Ebner
2022-11-25 14:40 ` [pve-devel] [PATCH V4 qemu-server 6/7] adapt behavior for detaching drives to deatching container mount points Stefan Hrdlicka
2022-12-13 13:08 ` Fiona Ebner
2022-11-25 14:40 ` [pve-devel] [PATCH V4 pve-manager 7/7] fix #3711: optionally allow CT deletion to complete on disk volume removal errors Stefan Hrdlicka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aff3065a-b59c-214e-58aa-d1062160ef19@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
--cc=s.hrdlicka@proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox