From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com, aderumier@odiso.com
Subject: Re: [pve-devel] [PATCH v3 qemu-server 2/7] cloudinit: generate cloudinit drive on offline plug
Date: Thu, 31 Mar 2022 15:01:17 +0200 [thread overview]
Message-ID: <9ff3d2a3-b4dc-20c7-8dc1-810d50ab9461@proxmox.com> (raw)
In-Reply-To: <20210609115417.3326775-3-aderumier@odiso.com>
Am 09.06.21 um 13:54 schrieb Alexandre Derumier:
> Currently when only generate it at vm start
>
> Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
> ---
> PVE/QemuServer.pm | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
> index 25ac052..6ddac72 100644
> --- a/PVE/QemuServer.pm
> +++ b/PVE/QemuServer.pm
> @@ -4776,6 +4776,8 @@ sub vmconfig_apply_pending {
>
> PVE::QemuConfig->cleanup_pending($conf);
>
> + my $generate_cloudnit = undef;
> +
> foreach my $opt (keys %{$conf->{pending}}) { # add/change
> next if $opt eq 'delete'; # just to be sure
> eval {
> @@ -4783,6 +4785,12 @@ sub vmconfig_apply_pending {
> vmconfig_register_unused_drive($storecfg, $vmid, $conf, parse_drive($opt, $conf->{$opt}))
> }
> };
> +
> + if (is_valid_drivename($opt)) {
> + my $drive = parse_drive($opt, $conf->{pending}->{$opt});
> + $generate_cloudnit = 1 if drive_is_cloudinit($drive);
> + }
This is bad, because it introduces code (and in particular function
calls, which could contain another eval) between an eval and its error
handling.
> +
> if (my $err = $@) {
> $add_apply_error->($opt, $err);
> } else {
> @@ -4792,6 +4800,8 @@ sub vmconfig_apply_pending {
>
> # write all changes at once to avoid unnecessary i/o
> PVE::QemuConfig->write_config($vmid, $conf);
> +
> + PVE::QemuServer::Cloudinit::generate_cloudinitconfig($conf, $vmid) if $generate_cloudnit;
> }
>
> sub vmconfig_update_net {
next prev parent reply other threads:[~2022-03-31 13:01 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-09 11:54 [pve-devel] [PATCH v3 qemu-server 0/7] cloudinit pending behaviour change Alexandre Derumier
2021-06-09 11:54 ` [pve-devel] [PATCH v3 qemu-server 1/7] cloudinit: add vm config to cloudinit drive Alexandre Derumier
2022-03-31 13:01 ` Fabian Ebner
2021-06-09 11:54 ` [pve-devel] [PATCH v3 qemu-server 2/7] cloudinit: generate cloudinit drive on offline plug Alexandre Derumier
2022-03-31 13:01 ` Fabian Ebner [this message]
2021-06-09 11:54 ` [pve-devel] [PATCH v3 qemu-server 3/7] cloudinit: make cloudnit options fastplug Alexandre Derumier
2022-03-31 13:01 ` Fabian Ebner
2021-06-09 11:54 ` [pve-devel] [PATCH v3 qemu-server 4/7] api2: add cloudinit config api Alexandre Derumier
2022-03-31 13:01 ` Fabian Ebner
2022-04-27 14:14 ` DERUMIER, Alexandre
2021-06-09 11:54 ` [pve-devel] [PATCH v3 qemu-server 5/7] cloudinit : add extract_cloudinit_config Alexandre Derumier
2022-03-31 13:01 ` Fabian Ebner
2021-06-09 11:54 ` [pve-devel] [PATCH v3 qemu-server 6/7] api2: add cloudinit_update Alexandre Derumier
2022-03-31 13:01 ` Fabian Ebner
2021-06-09 11:54 ` [pve-devel] [PATCH v3 qemu-server 7/7] add cloudinit hotplug Alexandre Derumier
2022-03-31 13:01 ` [pve-devel] [PATCH v3 qemu-server 0/7] cloudinit pending behaviour change Fabian Ebner
2022-03-31 13:11 ` DERUMIER, Alexandre
2022-04-20 16:22 ` DERUMIER, Alexandre
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=9ff3d2a3-b4dc-20c7-8dc1-810d50ab9461@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=aderumier@odiso.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