this series improves the behaviour of the file-restore when some mount operations take longer than the 30 second pveproxy timeout
some of the previous version was already applied (pbs + gui) so only the pve part is still missing i changed the way we return the error a bit from my previous (and already applied) attempt, namely i couple how we return the error on the 'output-format' instead of a seperate 'json-error' while this is technically a change in behaviour, this is imho ok because: * setting 'output-format' to json(-pretty) did not format the error, so a tool would have to cope with the pure text * AFAIK we don't have the same guarantees for the cli as for the api * it's a much better interface than before but since this changed, and the 'json-error' was already applied, the dependencies go as follows: pve-storage depends on the new proxmox-backup-file-restore/pve-common to work properly, but it's not broken with the current versions proxmox-backup breaks the current pve-storage (so that we must bump and add a 'breaks <<' probably) the gui should already handle the new code, so that is fine either way changes from v2: * couple the error format to 'ouput-format' instead of 'json-error' * remove 'error' property from 'error json object' (was redundant) * always expect an error when we get an object and always treat it as ok when we get a list changes from v1: * rebased on master * moved the json-error and timeout directly into pve-common (hardcoded) since there is only one usage of that function pve-common: Dominik Csapak (1): PBSClient: file_restore_list: add timeout parameter src/PVE/PBSClient.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) pve-storage: Dominik Csapak (1): api: FileRestore: decode and return proper error with new file-restore params PVE/API2/Storage/FileRestore.pm | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) proxmox-backup: Dominik Csapak (1): file-restore: remove 'json-error' parameter from list_files proxmox-file-restore/src/main.rs | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) -- 2.30.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel