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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 58B55741FD for ; Tue, 1 Jun 2021 09:30:24 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4EE20266C6 for ; Tue, 1 Jun 2021 09:30:24 +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 AC9A126217 for ; Tue, 1 Jun 2021 09:30:22 +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 831D343568 for ; Tue, 1 Jun 2021 09:30:22 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Tue, 1 Jun 2021 09:30:13 +0200 Message-Id: <20210601073013.4116145-2-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210601073013.4116145-1-f.gruenbichler@proxmox.com> References: <20210601073013.4116145-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.014 Adjusted score from AWL reputation of From: address 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. [api.rs] Subject: [pbs-devel] [PATCH proxmox-backup 2/2] Revert "file-restore-daemon: work around tokio DuplexStream bug" 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, 01 Jun 2021 07:30:24 -0000 This reverts commit 75f9f40922f9c5380336b987519d9d46d5b6db03, which is no longer needed now that we use tokio >= 1.6 which contains the proper fix. Signed-off-by: Fabian Grünbichler --- Feel free to squash into a single commit on applying.. src/bin/proxmox_restore_daemon/api.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/bin/proxmox_restore_daemon/api.rs b/src/bin/proxmox_restore_daemon/api.rs index f2732e64..42328fb7 100644 --- a/src/bin/proxmox_restore_daemon/api.rs +++ b/src/bin/proxmox_restore_daemon/api.rs @@ -286,11 +286,7 @@ fn extract( bail!("file or directory {:?} does not exist", path); } - // FIXME: DuplexStream is currently broken and doesn't wake pending writers on close, i.e. - // this doesn't drop the WatchdogInhibitor if we encounter an error (client aborts, etc...) - // see: https://github.com/tokio-rs/tokio/pull/3756 - // let (mut writer, reader) = tokio::io::duplex(1024 * 64); - let (mut writer, reader) = tokio::net::UnixStream::pair()?; + let (mut writer, reader) = tokio::io::duplex(1024 * 64); if pxar { tokio::spawn(async move { -- 2.20.1