mirror/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2024-12-23 08:16:36 +00:00
Code Issues Releases Wiki Activity

Merge pull request #4782 from MichaelEischer/fix-sftp-performance

Browse source 
Fix sftp upload performance
This commit is contained in:
Michael Eischer 2024-05-12 15:28:33 +02:00 committed by GitHub
commit b5fdb1d637
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
changelog/unreleased/issue-4209 Normal file
View file

@ -0,0 +1,7 @@
Bugfix: Fix slow sftp upload performance
Since restic 0.12.1, the upload speed of the sftp backend to a remote server
has regressed significantly. This has been fixed.
https://github.com/restic/restic/issues/4209
https://github.com/restic/restic/pull/4782

9
internal/backend/sftp/sftp.go
View file

@ -102,7 +102,12 @@ func startClient(cfg Config) (*SFTP, error) {
}() }()
// open the SFTP session // open the SFTP session
client, err := sftp.NewClientPipe(rd, wr) client, err := sftp.NewClientPipe(rd, wr,
// write multiple packets (32kb) in parallel per file
// not strictly necessary as we use ReadFromWithConcurrency
sftp.UseConcurrentWrites(true),
// increase send buffer per file to 4MB
sftp.MaxConcurrentRequestsPerFile(128))
if err != nil { if err != nil {
return nil, errors.Errorf("unable to start the sftp session, error: %v", err) return nil, errors.Errorf("unable to start the sftp session, error: %v", err)
} }
@ -359,7 +364,7 @@ func (r *SFTP) Save(_ context.Context, h backend.Handle, rd backend.RewindReader
}() }()
// save data, make sure to use the optimized sftp upload method // save data, make sure to use the optimized sftp upload method
wbytes, err := f.ReadFrom(rd) wbytes, err := f.ReadFromWithConcurrency(rd, 0)
if err != nil { if err != nil {
_ = f.Close() _ = f.Close()
err = r.checkNoSpace(dirname, rd.Length(), err) err = r.checkNoSpace(dirname, rd.Length(), err)