Skip to content

Add busy_timeout to verify! method to gracefully handle concurrent write locks #74

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

Open
jonyoi wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add busy_timeout to verify! method to gracefully handle concurrent write locks #74

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
5 changes: 4 additions & 1 deletion lib/litestream.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,10 @@ def initialize
mattr_accessor :base_controller_class, default: "::ApplicationController"

class << self
def verify!(database_path, replication_sleep: 10)
def verify!(database_path, replication_sleep: 10, busy_timeout: 5000)
database = SQLite3::Database.new(database_path)
# Apply the busy_timeout to handle concurrent write locks gracefully
database.busy_timeout = busy_timeout
database.execute("CREATE TABLE IF NOT EXISTS _litestream_verification (id INTEGER PRIMARY KEY, uuid BLOB)")
sentinel = SecureRandom.uuid
database.execute("INSERT INTO _litestream_verification (uuid) VALUES (?)", [sentinel])
Expand All @@ -49,6 +51,7 @@ def verify!(database_path, replication_sleep: 10)
Litestream::Commands.restore(database_path, **{"-o" => backup_path})

backup = SQLite3::Database.new(backup_path)
backup.busy_timeout = busy_timeout
result = backup.execute("SELECT 1 FROM _litestream_verification WHERE uuid = ? LIMIT 1", sentinel) # => [[1]] || []

raise VerificationFailure, "Verification failed for `#{database_path}`" if result.empty?
Expand Down