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 DA3D767648 for ; Tue, 12 Jan 2021 14:58:38 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D884A26B69 for ; Tue, 12 Jan 2021 14:58:38 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 3385826B5E for ; Tue, 12 Jan 2021 14:58:38 +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 F36F845795 for ; Tue, 12 Jan 2021 14:58:37 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Tue, 12 Jan 2021 14:58:17 +0100 Message-Id: <20210112135830.2798301-8-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210112135830.2798301-1-f.gruenbichler@proxmox.com> References: <20210112135830.2798301-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.027 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox-backup 03/12] proxmox XXX: use tokio::time::timeout directly X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jan 2021 13:58:38 -0000 Signed-off-by: Fabian Grünbichler --- Notes: needs a bump in Cargo.toml and the proper version added to the commit title src/client/http_client.rs | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/src/client/http_client.rs b/src/client/http_client.rs index 7febbe51..33860abf 100644 --- a/src/client/http_client.rs +++ b/src/client/http_client.rs @@ -18,7 +18,6 @@ use proxmox::{ api::error::HttpError, sys::linux::tty, tools::fs::{file_get_json, replace_file, CreateOptions}, - tools::future::TimeoutFutureExt, }; use super::pipe_to_stream::PipeToSendStream; @@ -562,10 +561,12 @@ impl HttpClient { let enc_ticket = format!("PBSAuthCookie={}", percent_encode(auth.ticket.as_bytes(), DEFAULT_ENCODE_SET)); req.headers_mut().insert("Cookie", HeaderValue::from_str(&enc_ticket).unwrap()); - let resp = client - .request(req) - .or_timeout_err(HTTP_TIMEOUT, format_err!("http download request timed out")) - .await?; + let resp = tokio::time::timeout( + HTTP_TIMEOUT, + client.request(req) + ) + .await + .map_err(|_| format_err!("http download request timed out"))??; let status = resp.status(); if !status.is_success() { HttpClient::api_response(resp) @@ -632,10 +633,12 @@ impl HttpClient { req.headers_mut().insert("UPGRADE", HeaderValue::from_str(&protocol_name).unwrap()); - let resp = client - .request(req) - .or_timeout_err(HTTP_TIMEOUT, format_err!("http upgrade request timed out")) - .await?; + let resp = tokio::time::timeout( + HTTP_TIMEOUT, + client.request(req) + ) + .await + .map_err(|_| format_err!("http upgrade request timed out"))??; let status = resp.status(); if status != http::StatusCode::SWITCHING_PROTOCOLS { @@ -715,10 +718,14 @@ impl HttpClient { req: Request ) -> Result { - client.request(req) - .or_timeout_err(HTTP_TIMEOUT, format_err!("http request timed out")) - .and_then(Self::api_response) - .await + Self::api_response( + tokio::time::timeout( + HTTP_TIMEOUT, + client.request(req) + ) + .await + .map_err(|_| format_err!("http request timed out"))?? + ).await } // Read-only access to server property -- 2.20.1