From fdfbf6e04ee398b3fe39bf2dbddb810c63cb395f Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Tue, 7 Jan 2025 09:11:12 -0500 Subject: [PATCH] Set statement timeout to zero in maintenance CLI (#33484) --- lib/mastodon/cli/maintenance.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/mastodon/cli/maintenance.rb b/lib/mastodon/cli/maintenance.rb index 532fbc328a..32ee35c7c7 100644 --- a/lib/mastodon/cli/maintenance.rb +++ b/lib/mastodon/cli/maintenance.rb @@ -192,6 +192,7 @@ module Mastodon::CLI verify_schema_version! verify_sidekiq_not_active! verify_backup_warning! + disable_timeout! end def process_deduplications @@ -251,6 +252,13 @@ module Mastodon::CLI fail_with_message 'Maintenance process stopped.' unless yes?('Continue? (Yes/No)') end + def disable_timeout! + # Remove server-configured timeout if present + database_connection.execute(<<~SQL.squish) + SET statement_timeout = 0 + SQL + end + def deduplicate_accounts! remove_index_if_exists!(:accounts, 'index_accounts_on_username_and_domain_lower')