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 B715E96B22
for <pve-devel@lists.proxmox.com>; Tue, 16 Apr 2024 14:10:34 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 63F42191A1
for <pve-devel@lists.proxmox.com>; Tue, 16 Apr 2024 14:10:03 +0200 (CEST)
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
for <pve-devel@lists.proxmox.com>; Tue, 16 Apr 2024 14:10:02 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id D67E04502D
for <pve-devel@lists.proxmox.com>; Tue, 16 Apr 2024 14:10:01 +0200 (CEST)
From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Tue, 16 Apr 2024 14:09:53 +0200
Message-Id: <20240416120957.75269-4-f.ebner@proxmox.com>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20240416120957.75269-1-f.ebner@proxmox.com>
References: <20240416120957.75269-1-f.ebner@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.070 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: [pve-devel] [PATCH v4 manager 3/5] close #4513: ui: backup job: add
tab for advanced options
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, 16 Apr 2024 12:10:34 -0000
pigz is not exposed, because it only works after manually installing
the pigz package.
ionice is not exposed, because it only works in combination with the
BFQ scheduler and even then not in all cases (only affects the
compressor when doing snapshot/suspend mode backup of a VM).
The pbs-entries-max performance option is not exposed. It is rather
niche and hard to understand. It serves as an escape hatch for
rare/extreme cases.
These can still be added with appropriate notes if there is enough
user demand.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
Changes in v4:
* rename to advanced
www/manager6/Makefile | 1 +
www/manager6/dc/Backup.js | 12 ++
www/manager6/panel/BackupAdvancedOptions.js | 142 ++++++++++++++++++++
3 files changed, 155 insertions(+)
create mode 100644 www/manager6/panel/BackupAdvancedOptions.js
diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index c756cae6..0f1779d5 100644
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -97,6 +97,7 @@ JSSRC= \
grid/Replication.js \
grid/ResourceGrid.js \
panel/ConfigPanel.js \
+ panel/BackupAdvancedOptions.js \
panel/BackupJobPrune.js \
panel/HealthWidget.js \
panel/IPSet.js \
diff --git a/www/manager6/dc/Backup.js b/www/manager6/dc/Backup.js
index 70903bdc..aaa319f4 100644
--- a/www/manager6/dc/Backup.js
+++ b/www/manager6/dc/Backup.js
@@ -196,6 +196,11 @@ Ext.define('PVE.dc.BackupEdit', {
PVE.Utils.unEscapeNotesTemplate(data['notes-template']);
}
+ if (data.performance) {
+ Object.assign(data, data.performance);
+ delete data.performance;
+ }
+
view.setValues(data);
},
});
@@ -466,6 +471,13 @@ Ext.define('PVE.dc.BackupEdit', {
},
],
},
+ {
+ xtype: 'pveBackupAdvancedOptionsPanel',
+ title: gettext('Advanced'),
+ cbind: {
+ isCreate: '{isCreate}',
+ },
+ },
],
},
],
diff --git a/www/manager6/panel/BackupAdvancedOptions.js b/www/manager6/panel/BackupAdvancedOptions.js
new file mode 100644
index 00000000..4d74ba3d
--- /dev/null
+++ b/www/manager6/panel/BackupAdvancedOptions.js
@@ -0,0 +1,142 @@
+/*
+ * Input panel for advanced backup options intended to be used as part of an edit/create window.
+ */
+Ext.define('PVE.panel.BackupAdvancedOptions', {
+ extend: 'Proxmox.panel.InputPanel',
+ xtype: 'pveBackupAdvancedOptionsPanel',
+ mixins: ['Proxmox.Mixin.CBind'],
+
+ cbindData: function() {
+ let me = this;
+ me.isCreate = !!me.isCreate;
+ return {};
+ },
+
+ onGetValues: function(formValues) {
+ if (this.needMask) { // isMasked() may not yet be true if not rendered once
+ return {};
+ }
+
+ let options = { 'delete': [] };
+
+ let performance = {};
+ let performanceOptions = ['max-workers', 'pbs-entries-max'];
+
+ for (const [key, value] of Object.entries(formValues)) {
+ if (performanceOptions.includes(key)) {
+ performance[key] = value;
+ // deleteEmpty is not currently implemented for pveBandwidthField
+ } else if (key === 'bwlimit' && value === '') {
+ options.delete.push('bwlimit');
+ } else if (key === 'delete') {
+ if (Array.isArray(value)) {
+ value.filter(opt => !performanceOptions.includes(opt)).forEach(
+ opt => options.delete.push(opt),
+ );
+ } else if (!performanceOptions.includes(formValues.delete)) {
+ options.delete.push(value);
+ }
+ } else {
+ options[key] = value;
+ }
+ }
+
+ if (Object.keys(performance).length > 0) {
+ options.performance = PVE.Parser.printPropertyString(performance);
+ } else {
+ options.delete.push('performance');
+ }
+
+ if (this.isCreate) {
+ delete options.delete;
+ }
+
+ return options;
+ },
+
+ column1: [
+ {
+ xtype: 'pveBandwidthField',
+ name: 'bwlimit',
+ fieldLabel: gettext('Bandwidth Limit'),
+ emptyText: gettext('use fallback'),
+ backendUnit: 'KiB',
+ allowZero: true,
+ emptyValue: '',
+ autoEl: {
+ tag: 'div',
+ 'data-qtip': Ext.String.format(gettext('Use {0} for unlimited'), 0),
+ },
+ },
+ {
+ xtype: 'proxmoxintegerfield',
+ name: 'zstd',
+ fieldLabel: Ext.String.format(gettext('{0} Threads'), 'Zstd'),
+ fieldStyle: 'text-align: right',
+ emptyText: gettext('use fallback'),
+ minValue: 0,
+ cbind: {
+ deleteEmpty: '{!isCreate}',
+ },
+ autoEl: {
+ tag: 'div',
+ 'data-qtip': gettext('With 0, half of the available cores are used'),
+ },
+ },
+ {
+ xtype: 'proxmoxintegerfield',
+ name: 'max-workers',
+ minValue: 1,
+ maxValue: 256,
+ fieldLabel: gettext('VM Workers'),
+ fieldStyle: 'text-align: right',
+ emptyText: gettext('use fallback'),
+ cbind: {
+ deleteEmpty: '{!isCreate}',
+ },
+ },
+ {
+ // It's part of the 'performance' property string, so have a field to preserve the
+ // value, but don't expose it. It's a rather niche setting and difficult to
+ // convey/understand what it does.
+ xtype: 'proxmoxintegerfield',
+ name: 'pbs-entries-max',
+ hidden: true,
+ fieldLabel: 'TODO',
+ fieldStyle: 'text-align: right',
+ emptyText: gettext('use fallback'),
+ cbind: {
+ deleteEmpty: '{!isCreate}',
+ },
+ },
+ ],
+
+ column2: [
+ {
+ xtype: 'displayfield',
+ value: gettext('Limit I/O bandwidth'),
+ },
+ {
+ xtype: 'displayfield',
+ value: `${gettext('Threads used for zstd compression')} (${gettext('non-PBS')})`,
+ },
+ {
+ xtype: 'displayfield',
+ value: `${gettext('I/O workers in the QEMU process')} (${gettext('VM only')})`,
+ },
+ {
+ xtype: 'displayfield',
+ value: 'TODO',
+ hidden: true, // see definition of pbs-entries-max field
+ },
+ ],
+
+ columnB: [
+ {
+ xtype: 'component',
+ userCls: 'pmx-hint',
+ padding: '5 1',
+ html: gettext("Note that vzdump.conf is used as a fallback"),
+ },
+ ],
+});
--
2.39.2