Skip to content

Use io.Copy for SSH uploads #805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
m90 merged 1 commit into from
Jun 17, 2026
+19 −31
Merged

Use io.Copy for SSH uploads #805

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 19 additions & 31 deletions internal/storage/ssh/ssh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,12 @@ func (b *sshStorage) Copy(file string) (returnErr error) {
returnErr = errors.Join(returnErr, source.Close())
}()

sourceFileInfo, err := source.Stat()
if err != nil {
returnErr = errwrap.Wrap(err, "error reading the source file stats")
return
}

destination, err := b.sftpClient.Create(path.Join(b.DestinationPath, name))
if err != nil {
returnErr = errwrap.Wrap(err, "error creating file")
Expand All @@ -133,39 +139,21 @@ func (b *sshStorage) Copy(file string) (returnErr error) {
returnErr = errors.Join(returnErr, destination.Close())
}()

chunk := make([]byte, 1e9)
for {
num, err := source.Read(chunk)
if err == io.EOF {
tot, err := destination.Write(chunk[:num])
if err != nil {
returnErr = errwrap.Wrap(err, "error uploading the file")
return
}

if tot != len(chunk[:num]) {
returnErr = errwrap.Wrap(nil, "failed to write stream")
return
}

break
}

if err != nil {
returnErr = errwrap.Wrap(err, "error uploading the file")
return
}
written, err := io.Copy(destination, source)
if err != nil {
returnErr = errwrap.Wrap(err, "error uploading the file")
return
}

tot, err := destination.Write(chunk[:num])
if err != nil {
returnErr = errwrap.Wrap(err, "error uploading the file")
return
}
if written != sourceFileInfo.Size() {
msg := fmt.Sprintf(
"failed to upload the file completely: wrote %d, expected %d",
written,
sourceFileInfo.Size(),
)

if tot != len(chunk[:num]) {
returnErr = errwrap.Wrap(nil, "failed to write stream")
return
}
returnErr = errwrap.Wrap(err, msg)
return
}

b.Log(storage.LogLevelInfo, b.Name(), "Uploaded a copy of backup `%s` to '%s' at path '%s'.", file, b.hostName, b.DestinationPath)
Expand Down
Loading