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 012DF1FF171
for <inbox@lore.proxmox.com>; Fri, 29 Nov 2024 16:01:14 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id A3F861BCC5;
Fri, 29 Nov 2024 16:01:14 +0100 (CET)
From: Christian Ebner <c.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Fri, 29 Nov 2024 16:00:13 +0100
Message-Id: <20241129150013.323432-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. [rec.data, proxmox.com]
Subject: [pve-devel] [PATCH v2 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 shown for virtual machine and container backup in
order to maintain the same layout for both, but only enabled for
container backup with a Proxmox Backup Server 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>
---
Changes since version 1 (thanks @Shannon for feedback):
- show selector for both, vm and ct to maintain layout, with the side
effect of requiring less conditional checks
- show a tooltip icon above the selector, in order to explain under
which circumstances the mode takes effect. Note: This was placed above
as otherwise the text will not be shown on hover if the selector is in
disabled state.
www/manager6/window/Backup.js | 36 +++++++++++++++++++++++++++++++++--
1 file changed, 34 insertions(+), 2 deletions(-)
diff --git a/www/manager6/window/Backup.js b/www/manager6/window/Backup.js
index 4418a9c7..24f7bbae 100644
--- a/www/manager6/window/Backup.js
+++ b/www/manager6/window/Backup.js
@@ -53,6 +53,19 @@ Ext.define('PVE.window.Backup', {
},
});
+ let pbsChangeDetectionModeSelector = 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"],
+ ],
+ });
+
const keepNames = [
['keep-last', gettext('Keep Last')],
['keep-hourly', gettext('Keep Hourly')],
@@ -110,10 +123,18 @@ 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);
+ }
+ pbsChangeDetectionModeSelector.setDisabled(true);
}
+
Proxmox.Utils.API2Request({
url: `/nodes/${me.nodename}/vzdump/defaults`,
method: 'GET',
@@ -193,6 +214,13 @@ Ext.define('PVE.window.Backup', {
storagesel,
modeSelector,
protectedCheckbox,
+ {
+ xtype: 'box',
+ html: `<i class="fa fa-question-circle" data-qtip="
+ ${gettext("Mode to detect file changes and switch archive encoding format for container backups to Proxmox Backup Server. Not available for VM backups.")}
+ "></i>`,
+ },
+ pbsChangeDetectionModeSelector,
],
column2: [
compressionSelector,
@@ -289,6 +317,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