From: Thomas Lamprecht <t.lamprecht@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Daniel Tschlatscher <d.tschlatscher@proxmox.com>
Subject: Re: [pve-devel] [PATCH container 1/2] fix: clean up config when invalid ostemplate is given
Date: Thu, 17 Nov 2022 13:45:28 +0100 [thread overview]
Message-ID: <75e737ef-53d5-4157-f51c-c23c7c5ec52d@proxmox.com> (raw)
In-Reply-To: <20221117093932.343751-1-d.tschlatscher@proxmox.com>
the "fix" is unsual for non #bugids, rather tag the subsystem you're modifying, e.g.:
restore: clean up config when invalid source archive is given
Am 17/11/2022 um 10:39 schrieb Daniel Tschlatscher:
> Before, if an invalid/non-existant ostemplate parameter was passed,
s/existant/existent/
And it's only relevant in the restore case or? as otherwise there isn't
happening anything in that code part fwict; maybe hint that here.
> the task would abort, but would leave an empty config file behind.
> This also applies to errors for invalid mount point configurations.
> In both cases, the empty config will now be removed.
>
> Signed-off-by: Daniel Tschlatscher <d.tschlatscher@proxmox.com>
> ---
> src/PVE/API2/LXC.pm | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm
> index 79aecaa..7cc64af 100644
> --- a/src/PVE/API2/LXC.pm
> +++ b/src/PVE/API2/LXC.pm
> @@ -443,7 +443,14 @@ __PACKAGE__->register_method({
> }
> }
> };
> - die "$emsg $@" if $@;
> +
> + if (my $reason = $@) {
> + if (!$same_container_exists) {
> + eval { PVE::LXC::Config->destroy_config($vmid) };
we already have such a section below, maybe you could move that out in the general cleanup
and set a flag similarly to $remove_lock, e.g., $destroy_config_on_error then in the error
path of the outher locked call it would look something like:
if ($destroy_config_on_error) {
eval { PVE::LXC::Config->destroy_config($vmid) };
warn $@ if $@;
} elsif ($remove_lock) {
PVE::LXC::Config->remove_lock($vmid, 'create');
}
that way you wouldn't need to override remove_lock either. Not a strong preference
towards that, so just throwing the idea out there.
> + $remove_lock = 0;
> + }
> + die "$emsg $reason";
> + }
>
> # up until here we did not modify the container, besides the lock
> $remove_lock = 0;
prev parent reply other threads:[~2022-11-17 12:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-17 9:39 Daniel Tschlatscher
2022-11-17 9:39 ` [pve-devel] [PATCH container 2/2] fix: also remove firewall config after failed restore Daniel Tschlatscher
2022-11-17 12:45 ` Thomas Lamprecht [this message]
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=75e737ef-53d5-4157-f51c-c23c7c5ec52d@proxmox.com \
--to=t.lamprecht@proxmox.com \
--cc=d.tschlatscher@proxmox.com \
--cc=pve-devel@lists.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