[pbs-devel] [PATCH proxmox-backup 1/2] bump tokio dependency to 1.6

[pbs-devel] [PATCH proxmox-backup 1/2] bump tokio dependency to 1.6

[Fabian Grünbichler]

it contains a bug fix that allows dropping the workaround in

75f9f40922f9c5380336b987519d9d46d5b6db03 file-restore-daemon: work around tokio DuplexStream bug

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 Cargo.toml     |  2 +-
 debian/control | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 6ce778dd..6f6490e7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -67,7 +67,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 siphasher = "0.3"
 syslog = "4.0"
-tokio = { version = "1.0", features = [ "fs", "io-util", "io-std", "macros", "net", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "time" ] }
+tokio = { version = "1.6", features = [ "fs", "io-util", "io-std", "macros", "net", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "time" ] }
 tokio-openssl = "0.6.1"
 tokio-stream = "0.1.0"
 tokio-util = { version = "0.6", features = [ "codec", "io" ] }
diff --git a/debian/control b/debian/control
index 468dd4e1..5bf595b4 100644
--- a/debian/control
+++ b/debian/control
@@ -58,18 +58,18 @@ Build-Depends: debhelper (>= 11),
  librust-siphasher-0.3+default-dev,
  librust-syslog-4+default-dev,
  librust-thiserror-1+default-dev,
- librust-tokio-1+default-dev,
- librust-tokio-1+fs-dev,
- librust-tokio-1+io-std-dev,
- librust-tokio-1+io-util-dev,
- librust-tokio-1+macros-dev,
- librust-tokio-1+net-dev,
- librust-tokio-1+parking-lot-dev,
- librust-tokio-1+process-dev,
- librust-tokio-1+rt-dev,
- librust-tokio-1+rt-multi-thread-dev,
- librust-tokio-1+signal-dev,
- librust-tokio-1+time-dev,
+ librust-tokio-1+default-dev (>= 1.6-~~),
+ librust-tokio-1+fs-dev (>= 1.6-~~),
+ librust-tokio-1+io-std-dev (>= 1.6-~~),
+ librust-tokio-1+io-util-dev (>= 1.6-~~),
+ librust-tokio-1+macros-dev (>= 1.6-~~),
+ librust-tokio-1+net-dev (>= 1.6-~~),
+ librust-tokio-1+parking-lot-dev (>= 1.6-~~),
+ librust-tokio-1+process-dev (>= 1.6-~~),
+ librust-tokio-1+rt-dev (>= 1.6-~~),
+ librust-tokio-1+rt-multi-thread-dev (>= 1.6-~~),
+ librust-tokio-1+signal-dev (>= 1.6-~~),
+ librust-tokio-1+time-dev (>= 1.6-~~),
  librust-tokio-openssl-0.6+default-dev (>= 0.6.1-~~),
  librust-tokio-stream-0.1+default-dev,
  librust-tokio-util-0.6+codec-dev,
-- 
2.20.1

[pbs-devel] [PATCH proxmox-backup 2/2] Revert "file-restore-daemon: work around tokio DuplexStream bug"

[Fabian Grünbichler]

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 <f.gruenbichler@proxmox.com>
---
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