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 [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id 0B9FB1FF16F
for <inbox@lore.proxmox.com>; Fri, 29 Nov 2024 13:41:31 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 07B4818B11;
Fri, 29 Nov 2024 13:41:32 +0100 (CET)
From: Christian Ebner <c.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Fri, 29 Nov 2024 13:40:53 +0100
Message-Id: <20241129124053.217032-1-c.ebner@proxmox.com>
X-Mailer: git-send-email 2.39.5
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.030 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
RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
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. [proxmox.com, rec.data]
Subject: [pve-devel] [PATCH pve-manager] fix #5936: ui: backup: add CT PBS
change detection mode selector
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>
Allow to select the change detection mode when performing manual
backups of containers with Proxmox Backup Server as target, just like
for the advanced backup job options introduced by commit 3b21f19f
("www: advanced backup: add pbs change detection mode selector").
The selector is only shown in the backup window for containers and
only enabled when a Proxmox Backup Server is selected as target
storage.
Link to issue in bugtracker:
https://bugzilla.proxmox.com/show_bug.cgi?id=5936
Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
www/manager6/window/Backup.js | 32 ++++++++++++++++++++++++++++++--
1 file changed, 30 insertions(+), 2 deletions(-)
diff --git a/www/manager6/window/Backup.js b/www/manager6/window/Backup.js
index 4418a9c7..82a2bd92 100644
--- a/www/manager6/window/Backup.js
+++ b/www/manager6/window/Backup.js
@@ -53,6 +53,19 @@ Ext.define('PVE.window.Backup', {
},
});
+ let pbsChangeDetectionModeSelector = me.vmtype === 'lxc' ? Ext.create({
+ xtype: 'proxmoxKVComboBox',
+ fieldLabel: gettext('PBS change detection mode'),
+ name: 'pbs-change-detection-mode',
+ deleteEmpty: true,
+ value: '__default__',
+ comboItems: [
+ ['__default__', "Default"],
+ ['data', "Data"],
+ ['metadata', "Metadata"],
+ ],
+ }) : null;
+
const keepNames = [
['keep-last', gettext('Keep Last')],
['keep-hourly', gettext('Keep Hourly')],
@@ -110,10 +123,20 @@ Ext.define('PVE.window.Backup', {
if (rec && rec.data && rec.data.type === 'pbs') {
compressionSelector.setValue('zstd');
compressionSelector.setDisabled(true);
- } else if (!compressionSelector.getEditable()) {
- compressionSelector.setDisabled(false);
+ if (me.vmtype === 'lxc') {
+ pbsChangeDetectionModeSelector.setValue('__default__');
+ pbsChangeDetectionModeSelector.setDisabled(false);
+ }
+ } else {
+ if (!compressionSelector.getEditable()) {
+ compressionSelector.setDisabled(false);
+ }
+ if (me.vmtype === 'lxc') {
+ pbsChangeDetectionModeSelector.setDisabled(true);
+ }
}
+
Proxmox.Utils.API2Request({
url: `/nodes/${me.nodename}/vzdump/defaults`,
method: 'GET',
@@ -193,6 +216,7 @@ Ext.define('PVE.window.Backup', {
storagesel,
modeSelector,
protectedCheckbox,
+ pbsChangeDetectionModeSelector,
],
column2: [
compressionSelector,
@@ -289,6 +313,10 @@ Ext.define('PVE.window.Backup', {
params.protected = values.protected;
}
+ if (values['pbs-change-detection-mode']) {
+ params['pbs-change-detection-mode'] = values['pbs-change-detection-mode'];
+ }
+
if (values['notes-template']) {
params['notes-template'] = PVE.Utils.escapeNotesTemplate(
values['notes-template']);
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel