From 678e75e1c200d63b5c6fe8ab9eb0f62b14dfa7ed Mon Sep 17 00:00:00 2001
From: Michael Eischer <michael.eischer@fau.de>
Date: Fri, 1 Jan 2021 12:19:48 +0100
Subject: [PATCH] sftp: enforce use of optimized upload method
ReadFrom was already used by Save before, this just ensures that this
won't accidentally change in the future.
---
internal/backend/sftp/sftp.go | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/internal/backend/sftp/sftp.go b/internal/backend/sftp/sftp.go
index e395de60d..7fa4b7319 100644
--- a/internal/backend/sftp/sftp.go
+++ b/internal/backend/sftp/sftp.go
@@ -287,8 +287,8 @@ func (r *SFTP) Save(ctx context.Context, h restic.Handle, rd restic.RewindReader
return errors.Wrap(err, "OpenFile")
}
- // save data
- _, err = io.Copy(f, rd)
+ // save data, make sure to use the optimized sftp upload method
+ _, err = f.ReadFrom(rd)
if err != nil {
_ = f.Close()
return errors.Wrap(err, "Write")
@@ -332,6 +332,8 @@ func (r *SFTP) openReader(ctx context.Context, h restic.Handle, length int, offs
}
if length > 0 {
+ // unlimited reads usually use io.Copy which needs WriteTo support at the underlying reader
+ // limited reads are usually combined with io.ReadFull which reads all required bytes into a buffer in one go
return backend.LimitReadCloser(f, int64(length)), nil
}