From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 122C29560 for ; Tue, 26 Apr 2022 12:14:05 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E879919EA0 for ; Tue, 26 Apr 2022 12:14:04 +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 id E5FDD19E5A for ; Tue, 26 Apr 2022 12:14: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 BB26B42C0C for ; Tue, 26 Apr 2022 12:14:02 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Tue, 26 Apr 2022 12:13:53 +0200 Message-Id: <20220426101401.3216096-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.127 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [main.rs, filerestore.pm, api.rs, pbsclient.pm, disk.rs] Subject: [pve-devel] [PATCH proxmox-backup/common/storage/wt v2] improve file-restore timeout behaviour X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2022 10:14:05 -0000 this series improves the behaviour of the file-restore when some mount operations take longer than the 30 second pveproxy timeout, and improves the startup speed of the restore vm we do this by moving the disk init into the background of the daemon startup, while the hyper server is starting, and by adding a timeout option to the file-restore binary. to be able to report the error back to the gui, we return a 'SERVICE_UNAVAILABLE' error in the timeout case, and the gui tries again (up to 10 times). backup patches 2,3 could be applied independently, as they even make sense withouth the rest pve-storage depends on a new pve-common&file-restore widget-toolkit makes only sense with the other patches, but is designed to not change behaviour with the old api alternatively i could drop the 'json-error' parameter and do it always, or when timeout it set. 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 proxmox-backup: Dominik Csapak (5): restore-daemon: start disk initialization in parallel to the api restore-daemon: put blocking code into 'block_in_place' restore-daemon: avoid auto-mounting zpools file-restore: factor out 'list_files' file-restore: add 'timeout' and 'json-error' parameter proxmox-file-restore/src/main.rs | 206 ++++++++++++------ proxmox-restore-daemon/src/main.rs | 31 ++- .../src/proxmox_restore_daemon/api.rs | 12 +- .../src/proxmox_restore_daemon/disk.rs | 20 +- 4 files changed, 166 insertions(+), 103 deletions(-) pve-common: Dominik Csapak (1): PBSClient: file_restore_list: add json-error and timeout parameter src/PVE/PBSClient.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) pve-storage: Dominik Csapak (1): api: FileRestore: decode and return proper error with new file-restore params PVE/API2/Storage/FileRestore.pm | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) proxmox-widget-toolkit: Dominik Csapak (1): window/FileBrowser: try reload again when getting a 503 error src/window/FileBrowser.js | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) -- 2.30.2