From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 7/9] ui: tape/TapeRestore: don't send snapshotlist when restoring whole datastores
Date: Wed, 26 May 2021 15:48:09 +0200 [thread overview]
Message-ID: <20210526134811.333-8-d.csapak@proxmox.com> (raw)
In-Reply-To: <20210526134811.333-1-d.csapak@proxmox.com>
for the case that the user selects only whole datastores, we do not
want to send and (exhaustive) list of snapshots that get restored,
but we only want to honor the mapping the user gives
this avoids using the backup restore codepath that iterates twice
over the tapes and would generally be slower for a lot of snapshots
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
www/tape/window/TapeRestore.js | 57 +++++++++++++++++++++++++++++-----
1 file changed, 50 insertions(+), 7 deletions(-)
diff --git a/www/tape/window/TapeRestore.js b/www/tape/window/TapeRestore.js
index 1987dff4..35619957 100644
--- a/www/tape/window/TapeRestore.js
+++ b/www/tape/window/TapeRestore.js
@@ -184,9 +184,13 @@ Ext.define('PBS.TapeManagement.TapeRestoreWindow', {
values = [];
}
let datastores = {};
- values.forEach((snapshot) => {
- const [datastore] = snapshot.split(':');
- datastores[datastore] = true;
+ values.forEach((snapshotOrDatastore) => {
+ let datastore = snapshotOrDatastore;
+ if (snapshotOrDatastore.indexOf(':') !== -1) {
+ let snapshot = snapshotOrDatastore;
+ let match = snapshot.split(':');
+ datastore = match[0];
+ } datastores[datastore] = true;
});
me.setDataStores(Object.keys(datastores));
@@ -230,7 +234,7 @@ Ext.define('PBS.TapeManagement.TapeRestoreWindow', {
if (response.result.data.length > 0) {
grid.setDisabled(false);
grid.setVisible(true);
- grid.getStore().setData(response.result.data);
+ grid.setData(response.result.data);
grid.getSelectionModel().selectAll();
// we've shown a big list, center the window again
view.center();
@@ -294,10 +298,14 @@ Ext.define('PBS.TapeManagement.TapeRestoreWindow', {
onGetValues: function(values) {
let me = this;
- if (values.snapshots === 'all') {
- delete values.snapshots;
- } else if (Ext.isString(values.snapshots) && values.snapshots) {
+ if (values !== "all" &&
+ Ext.isString(values.snapshots) &&
+ values.snapshots &&
+ values.snapshots.indexOf(':') !== -1
+ ) {
values.snapshots = values.snapshots.split(',');
+ } else {
+ delete values.snapshots;
}
return values;
@@ -593,6 +601,8 @@ Ext.define('PBS.TapeManagement.SnapshotGrid', {
let me = this;
let snapshots = [];
+ let storeCounts = {};
+
me.getSelection().forEach((rec) => {
let id = rec.get('id');
let store = rec.data.store;
@@ -600,6 +610,10 @@ Ext.define('PBS.TapeManagement.SnapshotGrid', {
// only add if not filtered
if (me.store.findExact('id', id) !== -1) {
snapshots.push(`${store}:${snap}`);
+ if (storeCounts[store] === undefined) {
+ storeCounts[store] = 0;
+ }
+ storeCounts[store]++;
}
});
@@ -610,6 +624,21 @@ Ext.define('PBS.TapeManagement.SnapshotGrid', {
return "all";
}
+ let wholeStores = [];
+ let wholeStoresSelected = true;
+ for (const [store, count] of Object.entries(storeCounts)) {
+ if (me.storeCounts[store] === count) {
+ wholeStores.push(store);
+ } else {
+ wholeStoresSelected = false;
+ break;
+ }
+ }
+
+ if (wholeStoresSelected) {
+ return wholeStores;
+ }
+
return snapshots;
},
@@ -639,6 +668,20 @@ Ext.define('PBS.TapeManagement.SnapshotGrid', {
return [];
},
+ setData: function(records) {
+ let me = this;
+ let storeCounts = {};
+ records.forEach((rec) => {
+ let store = rec.store;
+ if (storeCounts[store] === undefined) {
+ storeCounts[store] = 0;
+ }
+ storeCounts[store]++;
+ });
+ me.storeCounts = storeCounts;
+ me.getStore().setData(records);
+ },
+
scrollable: true,
plugins: 'gridfilters',
--
2.20.1
next prev parent reply other threads:[~2021-05-26 13:48 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-26 13:48 [pbs-devel] [PATCH proxmox-backup 0/9] tape: improve restore ux Dominik Csapak
2021-05-26 13:48 ` [pbs-devel] [PATCH proxmox-backup 1/9] ui: tape/BackupOverview: expand pools by default Dominik Csapak
2021-05-26 13:48 ` [pbs-devel] [PATCH proxmox-backup 2/9] api2/tape: add api call to list media sets Dominik Csapak
2021-05-26 13:48 ` [pbs-devel] [PATCH proxmox-backup 3/9] ui: tape/BackupOverview: rename action column to restore Dominik Csapak
2021-05-26 13:48 ` [pbs-devel] [PATCH proxmox-backup 4/9] ui: tape: add MediaSetSelector Dominik Csapak
2021-05-26 13:48 ` [pbs-devel] [PATCH proxmox-backup 5/9] ui: tape/TapeRestore: " Dominik Csapak
2021-05-26 13:48 ` [pbs-devel] [PATCH proxmox-backup 6/9] ui: tape/BackupOverview: add generic 'Restore' button Dominik Csapak
2021-05-26 13:48 ` Dominik Csapak [this message]
2021-05-26 13:48 ` [pbs-devel] [PATCH proxmox-backup 8/9] ui: tape/TapeRestore: allow preselecting a datastore Dominik Csapak
2021-05-26 13:48 ` [pbs-devel] [PATCH proxmox-backup 9/9] ui: tape/TapeRestore: fix some properties Dominik Csapak
2021-05-26 17:16 ` [pbs-devel] applied-series: [PATCH proxmox-backup 0/9] tape: improve restore ux Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210526134811.333-8-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox