Fix backups stopping due to read timeouts #12281
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nightpool
reviewed
Nov 2, 2019
app/services/backup_service.rb
Outdated
| @@ -143,6 +143,7 @@ def download_to_tar(tar, attachment, filename) | |||
| end | |||
| end | |||
| rescue Errno::ENOENT | |||
| rescue Seahorse::Client::NetworkingError | |||
There was a problem hiding this comment.
Why are we getting a Seahorse error instead of a ::Fog::Errors::Error, which paperclip rescues by default? This feels like a fog bug
There was a problem hiding this comment.
Paperclip doesn't use fog for S3.
Gargron
reviewed
Nov 4, 2019
app/services/backup_service.rb
Outdated
| @@ -143,6 +143,7 @@ def download_to_tar(tar, attachment, filename) | |||
| end | |||
| end | |||
| rescue Errno::ENOENT | |||
There was a problem hiding this comment.
This should be: rescue Errno::ENOENT, Seahorse::Client::NetworkingError
If an attachment read times out, assume that the resources is inaccessible and continue the backup without it. This fixes mastodon#12280.
chr-1x
force-pushed
the
fix-backup-timeout-error
branch
from
3821241
to
cd09d28
Compare
Gargron
approved these changes
Dec 30, 2019
Gargron
changed the title
rtucker
pushed a commit
to vulpineclub/mastodon
that referenced
this pull request
Jan 7, 2021
* Make BackupService resilient to read timeouts If an attachment read times out, assume that the resources is inaccessible and continue the backup without it. This fixes mastodon#12280. * Both errors on one line
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If an attachment read times out, assume that the attachment is inaccessible and continue the backup without it. This fixes #12280.