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 1/7] fix #3711: optionally allow CT deletion to complete on disk volume removal errors
Date: Tue, 13 Dec 2022 14:07:33 +0100 [thread overview]
Message-ID: <f695e538-6821-c8e0-887e-699e768eb010@proxmox.com> (raw)
In-Reply-To: <20221125144008.2988072-2-s.hrdlicka@proxmox.com>
Am 25.11.22 um 15:40 schrieb Stefan Hrdlicka:
> review fixes
> - rename parameter to ignore-storage-errors
> - move eval further up the call chain
This should go...
>
> Signed-off-by: Stefan Hrdlicka <s.hrdlicka@proxmox.com>
> ---
...here to not clobber up the commit message
> src/PVE/API2/LXC.pm | 8 ++++++++
> src/PVE/LXC.pm | 6 ++++--
> 2 files changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm
> index 79aecaa..19806fa 100644
> --- a/src/PVE/API2/LXC.pm
> +++ b/src/PVE/API2/LXC.pm
> @@ -700,6 +700,13 @@ __PACKAGE__->register_method({
> ." enabled storages which are not referenced in the config.",
> optional => 1,
> },
> + 'ignore-storage-errors' => {
> + type => 'boolean',
> + description => 'If set, this will ignore errors when trying to remove'
> + . ' container storage.',
I'd rather use 'volumes' than 'storage' here. Or 'disks' which is
already used in the 'destroy-unreferenced-disks' option.
> + default => 0,
> + optional => 1,
> + }
Style nit: missing comma (then the line doesn't need to be touched the
next time an option is added ;))
> },
> },
> returns => {
> @@ -761,6 +768,7 @@ __PACKAGE__->register_method({
> $conf,
> { lock => 'destroyed' },
> $param->{'destroy-unreferenced-disks'},
> + $param->{'ignore-storage-errors'},
> );
>
> PVE::AccessControl::remove_vm_access($vmid);
> diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm
> index 4bbd739..fe68f75 100644
> --- a/src/PVE/LXC.pm
> +++ b/src/PVE/LXC.pm
> @@ -861,7 +861,8 @@ sub delete_mountpoint_volume {
> }
>
> sub destroy_lxc_container {
> - my ($storage_cfg, $vmid, $conf, $replacement_conf, $purge_unreferenced) = @_;
> + my ($storage_cfg, $vmid, $conf, $replacement_conf,
> + $purge_unreferenced, $ignore_storage_errors) = @_;
>
> my $volids = {};
> my $remove_volume = sub {
> @@ -872,7 +873,8 @@ sub destroy_lxc_container {
> return if $volids->{$volume};
> $volids->{$volume} = 1;
>
> - delete_mountpoint_volume($storage_cfg, $vmid, $volume);
> + eval { delete_mountpoint_volume($storage_cfg, $vmid, $volume); };
> + die $@ if !$ignore_storage_errors && $@;
The commit message states that a warning is printed (which would be
nice), but the error is completely ignored here?
> };
> PVE::LXC::Config->foreach_volume_full($conf, {include_unused => 1}, $remove_volume);
>
next prev parent reply other threads:[~2022-12-13 13:07 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 [this message]
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
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=f695e538-6821-c8e0-887e-699e768eb010@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