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.

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

Jump to bottom

Avoid race conditions when creating backups #10234

Merged
merged 1 commit into from
Mar 10, 2019
Merged

Avoid race conditions when creating backups #10234

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
18 changes: 16 additions & 2 deletions app/controllers/settings/exports_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,25 @@ def show
end

def create
authorize :backup, :create?
raise Mastodon::NotPermittedError unless user_signed_in?

backup = nil

RedisLock.acquire(lock_options) do |lock|
if lock.acquired?
authorize :backup, :create?
backup = current_user.backups.create!
else
raise Mastodon::RaceConditionError
end
end

backup = current_user.backups.create!
BackupWorker.perform_async(backup.id)

redirect_to settings_export_path
end

def lock_options
{ redis: Redis.current, key: "backup:#{current_user.id}" }
end
end