Skip to content
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.

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

sftp: Fix ENOSPC check #4075

Merged
merged 2 commits into from Dec 9, 2022
Merged

sftp: Fix ENOSPC check #4075

merged 2 commits into from Dec 9, 2022

Conversation

greatroar
Copy link
Contributor

What does this PR change? What problem does it solve?

There were two bugs in the "no space left on device" check in the SFTP backend. With this patch, we check for space that is not reserved for the root user on the remote, and the check is no longer in a defer block because that wouldn't fire. Some change in the surrounding code may have led the deferred function to capture the wrong err variable.

Was the change previously discussed in an issue or on the forum?

Fixes #3336. Tested on Linux by backing up to an 8MiB ext2 image that has 50% space reserved for root.

Checklist

  • I have read the contribution guidelines.
  • I have enabled maintainer edits.
  • I have added tests for all code changes.
  • I have added documentation for relevant changes (in the manual).
  • There's a new file in changelog/unreleased/ that describes the changes for our users (see template).
  • I have run gofmt on the code in all commits.
  • All commit messages are formatted in the same style as the other commits in the repo.
  • I'm done! This pull request is ready for review.

We now check for space that is not reserved for the root user on the
remote, and the check is no longer in a defer block because it wouldn't
fire. Some change in the surrounding code may have led the deferred
function to capture the wrong err variable.

Fixes restic#3336.
Copy link
Member

@MichaelEischer MichaelEischer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Could you add a short changelog? The broken check was already introduced as part of restic 0.12.1.

@greatroar
Copy link
Contributor Author

@MichaelEischer Done.

@MichaelEischer
Copy link
Member

Thanks!

@MichaelEischer MichaelEischer merged commit 4b98b55 into restic:master Dec 9, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Write: sftp: "Failure" (SSH_FX_FAILURE) when the remote storage is full
2 participants