From 3420029b5e4cabbcac0f6c3f5f52a4b3b8e08084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Tue, 1 Jun 2021 09:30:13 +0200 Subject: [PATCH] Revert "file-restore-daemon: work around tokio DuplexStream bug" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- 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 {