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 B561887AF9
 for <pve-devel@lists.proxmox.com>; Tue,  4 Jan 2022 12:57:54 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
 by firstgate.proxmox.com (Proxmox) with ESMTP id AA2321BD1E
 for <pve-devel@lists.proxmox.com>; Tue,  4 Jan 2022 12:57:54 +0100 (CET)
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 229B51BD13
 for <pve-devel@lists.proxmox.com>; Tue,  4 Jan 2022 12:57:54 +0100 (CET)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
 by proxmox-new.maurer-it.com (Proxmox) with ESMTP id E4E8E4366C
 for <pve-devel@lists.proxmox.com>; Tue,  4 Jan 2022 12:57:53 +0100 (CET)
Message-ID: <411a7ee4-7997-1f2c-7f19-8bd01a77c215@proxmox.com>
Date: Tue, 4 Jan 2022 12:57:53 +0100
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.4.1
Content-Language: en-US
To: pve-devel@lists.proxmox.com,
 =?UTF-8?Q?Fabian_Gr=c3=bcnbichler?= <f.gruenbichler@proxmox.com>
References: <20211222135257.3242938-1-f.gruenbichler@proxmox.com>
 <20211222135257.3242938-11-f.gruenbichler@proxmox.com>
From: Fabian Ebner <f.ebner@proxmox.com>
In-Reply-To: <20211222135257.3242938-11-f.gruenbichler@proxmox.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results:  0
 AWL 1.826 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           -3.354 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
 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 03/10] parse_config: optional
 strict mode
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: Tue, 04 Jan 2022 11:57:54 -0000

Am 22.12.21 um 14:52 schrieb Fabian Grünbichler:
> when passing a config from one cluster to another, we want to be strict
> when parsing - it's better to fail the migration early and upgrade the
> target node instead of failing the migration later (when significant
> work for transferring disks and/or state has already been done) or not
> at all, but silently lose config settings that the target doesn't
> understand.
> 
> this also might be helpful in other cases - e.g. when restoring from a
> backup.
> 
> Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
> ---
> 
> Notes:
>      v3: new
> 
>   PVE/QemuServer.pm | 20 +++++++++++++++-----
>   1 file changed, 15 insertions(+), 5 deletions(-)
> 
> diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
> index f5beb1b..be88385 100644
> --- a/PVE/QemuServer.pm
> +++ b/PVE/QemuServer.pm
> @@ -2329,7 +2329,7 @@ sub destroy_vm {
>   }
>   
>   sub parse_vm_config {
> -    my ($filename, $raw) = @_;
> +    my ($filename, $raw, $strict) = @_;
>   
>       return if !defined($raw);
>   
> @@ -2339,6 +2339,16 @@ sub parse_vm_config {
>   	pending => {},
>       };
>   
> +    my $handle_error = sub {
> +	my ($msg) = @_;
> +
> +	if ($strict) {
> +	    warn $msg;
> +	} else {
> +	    die $msg;
> +	}

Inverted logic ;)

> +    };
> +
>       $filename =~ m|/qemu-server/(\d+)\.conf$|
>   	|| die "got strange filename '$filename'";
>   
> @@ -2393,14 +2403,14 @@ sub parse_vm_config {
>   	    if ($section eq 'pending') {
>   		$conf->{delete} = $value; # we parse this later
>   	    } else {
> -		warn "vm $vmid - propertry 'delete' is only allowed in [PENDING]\n";
> +		$handle_error->("vm $vmid - property 'delete' is only allowed in [PENDING]\n");
>   	    }
>   	} elsif ($line =~ m/^([a-z][a-z_]*\d*):\s*(.+?)\s*$/) {
>   	    my $key = $1;
>   	    my $value = $2;
>   	    eval { $value = check_type($key, $value); };
>   	    if ($@) {
> -		warn "vm $vmid - unable to parse value of '$key' - $@";
> +		$handle_error->("vm $vmid - unable to parse value of '$key' - $@");
>   	    } else {
>   		$key = 'ide2' if $key eq 'cdrom';
>   		my $fmt = $confdesc->{$key}->{format};
> @@ -2410,7 +2420,7 @@ sub parse_vm_config {
>   			$v->{file} = $volid;
>   			$value = print_drive($v);
>   		    } else {
> -			warn "vm $vmid - unable to parse value of '$key'\n";
> +			$handle_error->("vm $vmid - unable to parse value of '$key'\n");
>   			next;
>   		    }
>   		}
> @@ -2418,7 +2428,7 @@ sub parse_vm_config {
>   		$conf->{$key} = $value;
>   	    }
>   	} else {
> -	    warn "vm $vmid - unable to parse config: $line\n";
> +	    $handle_error->("vm $vmid - unable to parse config: $line\n");
>   	}
>       }
>