public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 2/2] Revert "file-restore-daemon: work around tokio DuplexStream bug"
Date: Tue,  1 Jun 2021 09:30:13 +0200	[thread overview]
Message-ID: <20210601073013.4116145-2-f.gruenbichler@proxmox.com> (raw)
In-Reply-To: <20210601073013.4116145-1-f.gruenbichler@proxmox.com>

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





      reply	other threads:[~2021-06-01  7:30 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-01  7:30 [pbs-devel] [PATCH proxmox-backup 1/2] bump tokio dependency to 1.6 Fabian Grünbichler
2021-06-01  7:30 ` Fabian Grünbichler [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210601073013.4116145-2-f.gruenbichler@proxmox.com \
    --to=f.gruenbichler@proxmox.com \
    --cc=pbs-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal