From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
	by lore.proxmox.com (Postfix) with ESMTPS id 582631FF56B
	for <inbox@lore.proxmox.com>; Mon, 22 Apr 2024 10:16:20 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
	by firstgate.proxmox.com (Proxmox) with ESMTP id 0A68CAAA2;
	Mon, 22 Apr 2024 10:16:22 +0200 (CEST)
Message-ID: <7fa12b35-de5c-4ecd-8923-d0d49142d95e@proxmox.com>
Date: Mon, 22 Apr 2024 10:15:41 +0200
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
References: <20240411092943.57377-1-f.ebner@proxmox.com>
 <20240411092943.57377-14-f.ebner@proxmox.com>
Content-Language: en-US
In-Reply-To: <20240411092943.57377-14-f.ebner@proxmox.com>
X-SPAM-LEVEL: Spam detection results:  0
 AWL -0.069 Adjusted score from AWL reputation of From: address
 BAYES_00                 -1.9 Bayes spam probability is 0 to 1%
 DMARC_MISSING             0.1 Missing DMARC policy
 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
 SPF_HELO_NONE           0.001 SPF: HELO does not publish an SPF Record
 SPF_PASS               -0.001 SPF: sender matches SPF record
Subject: Re: [pve-devel] [PATCH manager v3 13/22] vzdump: handle new
 'fleecing' property string
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>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>

Am 11.04.24 um 11:29 schrieb Fiona Ebner:
> @@ -282,6 +293,7 @@ sub read_vzdump_defaults {
>  	} keys %$confdesc_for_defaults
>      };
>      $parse_prune_backups_maxfiles->($defaults, "defaults in VZDump schema");
> +    parse_fleecing($defaults);
>      parse_performance($defaults);
>  
>      my $raw;
Forgot to mention there was a merge conflict here, because of 693b10f2
("vzdump: actually honor schema defaults for performance"). To avoid the
same issue with the fleecing property string, the hunk above was changed
in the same fashion to:

> @@ -299,6 +310,13 @@ sub read_vzdump_defaults {
>             defined($default) ? ($_ => $default) : ()
>         } keys $performance_fmt->%*
>      };
> +    my $fleecing_fmt = PVE::JSONSchema::get_format('backup-fleecing');
> +    $defaults->{fleecing} = {
> +       map {
> +           my $default = $fleecing_fmt->{$_}->{default};
> +           defined($default) ? ($_ => $default) : ()
> +       } keys $fleecing_fmt->%*
> +    };
>      $parse_prune_backups_maxfiles->($defaults, "defaults in VZDump schema");
>  
>      my $raw;



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel