tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "file-restore-daemon: work around tokio DuplexStream bug"

Browse Source 
This reverts commit 75f9f40922, which is
no longer needed now that we use tokio >= 1.6 which contains the proper
fix.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2021-06-01 09:30:13 +02:00 committed by Dietmar Maurer
parent f432a1c927
commit 3420029b5e
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/proxmox_restore_daemon/api.rs
View File

@ -286,11 +286,7 @@ fn extract(
bail!("file or directory {:?} does not exist", path); bail!("file or directory {:?} does not exist", path);
} }
// FIXME: DuplexStream is currently broken and doesn't wake pending writers on close, i.e. let (mut writer, reader) = tokio::io::duplex(1024 * 64);
// 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()?;
if pxar { if pxar {
tokio::spawn(async move { tokio::spawn(async move {