From a69f23580ec75f527fde9a6e61e421b5bf6cf056 Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Tue, 26 Apr 2022 12:14:01 +0200 Subject: [PATCH] window/FileBrowser: try reload again when getting a 503 error for the file restore, we return a 503 error when we were not finished mounting a disk in the restore vm, so ignore that error and try again (up to 10 times) so a file listing now has a "real" timeout of up to 300 seconds (30s pveproxy timeout * 10) instead of only 30, which should be enough for most situations. we also increase the proxy timeout to 60 seconds, since if one has many disks, all of them will try to load at the same time, but the browser has a maximum request limit and will stall+queue the remaining ones. so those will not run into the extjs timeout when we increase it here. for older backends without the new 503 returning feature, the calls will still run into a pveproxy timeout anyway. we also have to reimplement the 'monStoreErrors' functionality to get a slightly different behaviour: we disable the default extj loadMask of the treepanel and set it ourselves. then on 503 we leave it up, and only remove it on success or error (for non initial loads) Signed-off-by: Dominik Csapak --- src/window/FileBrowser.js | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/src/window/FileBrowser.js b/src/window/FileBrowser.js index 2efa988..f4a22b6 100644 --- a/src/window/FileBrowser.js +++ b/src/window/FileBrowser.js @@ -146,6 +146,9 @@ Ext.define("Proxmox.window.FileBrowser", { errorHandler: function(error, msg) { let me = this; + if (error?.status === 503) { + return false; + } me.lookup('downloadBtn').setDisabled(true); me.lookup('downloadTar').setDisabled(true); if (me.initialLoadDone) { @@ -167,9 +170,37 @@ Ext.define("Proxmox.window.FileBrowser", { let proxy = store.getProxy(); let errorCallback = (error, msg) => me.errorHandler(error, msg); - Proxmox.Utils.monStoreErrors(tree, store, true, errorCallback); proxy.setUrl(view.listURL); + proxy.setTimeout(60*1000); proxy.setExtraParams(view.extraParams); + + tree.mon(store, 'beforeload', () => { + Proxmox.Utils.setErrorMask(tree, true); + }); + tree.mon(store, 'load', (treestore, rec, success, operation, node) => { + if (success) { + Proxmox.Utils.setErrorMask(tree, false); + return; + } + if (!node.loadCount) { + node.loadCount = 0; // ensure its numeric + } + // trigger a reload if we got a 503 answer from the proxy + if (operation?.error?.status === 503 && node.loadCount < 10) { + node.collapse(); + node.expand(); + node.loadCount++; + return; + } + + let error = operation.getError(); + let msg = Proxmox.Utils.getResponseErrorMessage(error); + if (!errorCallback(error, msg)) { + Proxmox.Utils.setErrorMask(tree, msg); + } else { + Proxmox.Utils.setErrorMask(tree, false); + } + }); store.load((rec, op, success) => { let root = store.getRoot(); root.expand(); // always expand invisible root node @@ -217,6 +248,10 @@ Ext.define("Proxmox.window.FileBrowser", { }, }, + viewConfig: { + loadMask: false, + }, + columns: [ { text: gettext('Name'), -- 2.39.2