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

file-restore-daemon: work around tokio DuplexStream bug

Browse Source 
See this PR for more info: https://github.com/tokio-rs/tokio/pull/3756

As a workaround use a pair of connected unix sockets - this obviously
incurs some overhead, albeit not measureable on my machine. Once tokio
includes the fix we can go back to a DuplexStream for performance and
simplicity.

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
This commit is contained in:
Stefan Reiter 2021-05-06 17:26:20 +02:00 committed by Thomas Lamprecht
parent e9c2638f90
commit 75f9f40922
1 changed files with 5 additions and 1 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

@ -275,7 +275,11 @@ fn extract(
bail!("file or directory {:?} does not exist", path);
}
let (mut writer, reader) = tokio::io::duplex(1024 * 64);
// 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()?;
if pxar {
tokio::spawn(async move {