From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <d.csapak@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 745137F4FB
for <pve-devel@lists.proxmox.com>; Fri, 12 Nov 2021 13:37:30 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 689E319D58
for <pve-devel@lists.proxmox.com>; Fri, 12 Nov 2021 13:37:30 +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 9559B19D3C
for <pve-devel@lists.proxmox.com>; Fri, 12 Nov 2021 13:37:28 +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 67E14436BF
for <pve-devel@lists.proxmox.com>; Fri, 12 Nov 2021 13:37:28 +0100 (CET)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Fri, 12 Nov 2021 13:37:27 +0100
Message-Id: <20211112123727.232334-3-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20211112123727.232334-1-d.csapak@proxmox.com>
References: <20211112123727.232334-1-d.csapak@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.220 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
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. [vzdump.pm]
Subject: [pve-devel] [PATCH manager 3/3] jobs: vzdump: fixup prune-schedule
conf
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: Fri, 12 Nov 2021 12:37:30 -0000
when we parse the config, we get the 'prune-backup' decoded, but the
api call we use wants it as a property string, so encode it here again
this fixes having jobs with prune options
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
PVE/Jobs/VZDump.pm | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/PVE/Jobs/VZDump.pm b/PVE/Jobs/VZDump.pm
index 92b81147..c757eea1 100644
--- a/PVE/Jobs/VZDump.pm
+++ b/PVE/Jobs/VZDump.pm
@@ -72,6 +72,12 @@ sub run {
delete $conf->{$opt} if !defined($props->{$opt});
}
+ # fixup prune-backups, we get it decoded but want it as string parameter
+ $conf->{'prune-backups'} = PVE::JSONSchema::print_property_string(
+ $conf->{'prune-backups'},
+ 'prune-backups',
+ ) if $conf->{'prune-backups'} && ref($conf->{'prune-backups'}) eq 'HASH';
+
$conf->{quiet} = 1; # do not write to stdout/stderr
PVE::Cluster::cfs_update(); # refresh vmlist
--
2.30.2