all lists on 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] mapped loop device: use read loop instead of read_exact
Date: Thu, 29 Jun 2023 12:32:13 +0200	[thread overview]
Message-ID: <20230629103213.1041236-1-f.gruenbichler@proxmox.com> (raw)

since read_exact does not support short reads, which can easily happen if the
mapped image's EOF is not aligned with the request size.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---

Notes:
    reported on the forum:
    
    https://forum.proxmox.com/threads/problem-backing-up-using-backup-client.129347
    
    did a quick test reading from a mapped image full of random data, observed
    no performance difference..

 pbs-fuse-loop/src/fuse_loop.rs | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pbs-fuse-loop/src/fuse_loop.rs b/pbs-fuse-loop/src/fuse_loop.rs
index 3d0ef123..7e780799 100644
--- a/pbs-fuse-loop/src/fuse_loop.rs
+++ b/pbs-fuse-loop/src/fuse_loop.rs
@@ -188,13 +188,20 @@ impl<R: AsyncRead + AsyncSeek + Unpin> FuseLoopSession<R> {
                             match self.reader.seek(SeekFrom::Start(req.offset)).await {
                                 Ok(_) => {
                                     let mut buf = vec![0u8; req.size];
-                                    match self.reader.read_exact(&mut buf).await {
-                                        Ok(_) => {
-                                            req.reply(&buf)
-                                        },
-                                        Err(e) => {
-                                            req.io_fail(e)
+                                    let mut read = 0;
+                                    let mut res = Ok(());
+                                    while read < req.size && res.is_ok() {
+                                        match self.reader.read(&mut buf).await {
+                                            Ok(0) => { break; },
+                                            Ok(n) => { read += n; },
+                                            Err(e) => { res = Err(e); },
                                         }
+                                    };
+                                    if let Err(e) = res {
+                                        req.io_fail(e)
+                                    } else {
+                                        buf.truncate(read);
+                                        req.reply(&buf)
                                     }
                                 },
                                 Err(e) => {
-- 
2.39.2





             reply	other threads:[~2023-06-29 10:32 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-29 10:32 Fabian Grünbichler [this message]
2023-06-29 11:03 ` Dominik Csapak
2023-06-29 11:35   ` Fabian Grünbichler
2023-06-29 11:46     ` Dominik Csapak
2023-11-27  9:53 ` Fabian Grünbichler
2023-11-27 13:22 ` Wolfgang Bumiller
2023-11-27 17:27   ` Fabian Grünbichler
2023-11-28 10:07     ` Wolfgang Bumiller

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=20230629103213.1041236-1-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal