diff --git a/changelog/unreleased/issue-3336 b/changelog/unreleased/issue-3336 new file mode 100644 index 000000000..b22ab244f --- /dev/null +++ b/changelog/unreleased/issue-3336 @@ -0,0 +1,12 @@ +Bugfix: SFTP backend now checks for disk space + +A backup to an SFTP backend would spew repeated SSH_FX_FAILURE messages when +the remote disk is full. Restic now reports "sftp: no space left on device" +and exits immediately when it detects this condition. + +A fix for this issue was promised in restic 0.12.1, but the fix itself +contained a bug that prevented it from triggering. + +https://github.com/restic/restic/issues/3336 +https://github.com/restic/restic/pull/3345 +https://github.com/restic/restic/pull/4075 diff --git a/internal/backend/sftp/sftp.go b/internal/backend/sftp/sftp.go index 108d47463..514dd58da 100644 --- a/internal/backend/sftp/sftp.go +++ b/internal/backend/sftp/sftp.go @@ -354,14 +354,13 @@ func (r *SFTP) Save(ctx context.Context, h restic.Handle, rd restic.RewindReader debug.Log("sftp: failed to remove broken file %v: %v", f.Name(), rmErr) } - - err = r.checkNoSpace(dirname, rd.Length(), err) }() // save data, make sure to use the optimized sftp upload method wbytes, err := f.ReadFrom(rd) if err != nil { _ = f.Close() + err = r.checkNoSpace(dirname, rd.Length(), err) return errors.Wrap(err, "Write") } @@ -403,7 +402,7 @@ func (r *SFTP) checkNoSpace(dir string, size int64, origErr error) error { debug.Log("sftp: StatVFS returned %v", err) return origErr } - if fsinfo.Favail == 0 || fsinfo.FreeSpace() < uint64(size) { + if fsinfo.Favail == 0 || fsinfo.Frsize*fsinfo.Bavail < uint64(size) { err := errors.New("sftp: no space left on device") return backoff.Permanent(err) }