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 155CE63C81 for ; Thu, 27 Jan 2022 11:56:08 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F088A2162A for ; Thu, 27 Jan 2022 11:56:05 +0100 (CET) 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 EA35E21587 for ; Thu, 27 Jan 2022 11:56:02 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id BF25846CCE for ; Thu, 27 Jan 2022 11:56:02 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 27 Jan 2022 11:56:00 +0100 Message-Id: <20220127105601.2741602-8-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220127105601.2741602-1-d.csapak@proxmox.com> References: <20220127105601.2741602-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.160 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 Subject: [pve-devel] [PATCH storage 1/1] api: FileRestore: use new timeout and json-error parameters for list 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: Thu, 27 Jan 2022 10:56:08 -0000 use a timeout of 25 seconds (5 seconds headroom for pveproxys 30s timeout) and decode and return the error if one is returned in json form. Signed-off-by: Dominik Csapak --- PVE/API2/Storage/FileRestore.pm | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/PVE/API2/Storage/FileRestore.pm b/PVE/API2/Storage/FileRestore.pm index a4bad44..8d241d0 100644 --- a/PVE/API2/Storage/FileRestore.pm +++ b/PVE/API2/Storage/FileRestore.pm @@ -121,15 +121,28 @@ __PACKAGE__->register_method ({ if $vtype ne 'backup'; my $client = PVE::PBSClient->new($scfg, $storeid); - my $ret = $client->file_restore_list($snap, $path, $base64); - - # 'leaf' is a proper JSON boolean, map to perl-y bool - # TODO: make PBSClient decode all bools always as 1/0? - foreach my $item (@$ret) { - $item->{leaf} = $item->{leaf} ? 1 : 0; + my $ret = $client->file_restore_list($snap, $path, $base64, ['--json-error', 1, '--timeout', 25]); + + if (ref($ret) eq "HASH") { + my $msg = $ret->{message}; + if ($ret->{error}) { + if (my $code = $ret->{code}) { + die PVE::Exception->new("$msg\n", code => $code); + } else { + die "$msg\n"; + } + } + } elsif (ref($ret) eq "ARRAY") { + # 'leaf' is a proper JSON boolean, map to perl-y bool + # TODO: make PBSClient decode all bools always as 1/0? + foreach my $item (@$ret) { + $item->{leaf} = $item->{leaf} ? 1 : 0; + } + + return $ret; } - return $ret; + die "invalid proxmox-file-restore output"; }}); __PACKAGE__->register_method ({ -- 2.30.2