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 C2E69948A
for <pve-devel@lists.proxmox.com>; Thu, 31 Mar 2022 15:01:21 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id BEE991BC05
for <pve-devel@lists.proxmox.com>; Thu, 31 Mar 2022 15:01:21 +0200 (CEST)
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 id ACB1F1BBA6
for <pve-devel@lists.proxmox.com>; Thu, 31 Mar 2022 15:01:19 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 7B32044DD1;
Thu, 31 Mar 2022 15:01:19 +0200 (CEST)
Message-ID: <9ff3d2a3-b4dc-20c7-8dc1-810d50ab9461@proxmox.com>
Date: Thu, 31 Mar 2022 15:01:17 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
Thunderbird/91.7.0
Content-Language: en-US
To: pve-devel@lists.proxmox.com, aderumier@odiso.com
References: <20210609115417.3326775-1-aderumier@odiso.com>
<20210609115417.3326775-3-aderumier@odiso.com>
From: Fabian Ebner <f.ebner@proxmox.com>
In-Reply-To: <20210609115417.3326775-3-aderumier@odiso.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.114 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
T_SCC_BODY_TEXT_LINE -0.01 -
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [qemuserver.pm]
Subject: Re: [pve-devel] [PATCH v3 qemu-server 2/7] cloudinit: generate
cloudinit drive on offline plug
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: Thu, 31 Mar 2022 13:01:21 -0000
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 {