diff options
author | Robert Speicher <rspeicher@gmail.com> | 2016-07-15 17:59:01 +0300 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-07-15 17:59:01 +0300 |
commit | 2bcb246060d3cacb989fb5d341bfb52f55390f71 (patch) | |
tree | 78679382425bf3e3cf7fa621f7b91896f48aa9cf /lib/gitlab/database/migration_helpers.rb | |
parent | 4934cabb2e67f06634bf00a8c10d73b06118aec6 (diff) | |
parent | 8b7932c21951de172d531ab8a3e9506c98db7483 (diff) |
Merge branch 'master' into 8-10-stable
Diffstat (limited to 'lib/gitlab/database/migration_helpers.rb')
-rw-r--r-- | lib/gitlab/database/migration_helpers.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/gitlab/database/migration_helpers.rb b/lib/gitlab/database/migration_helpers.rb index dec20d8659b..927f9dad20b 100644 --- a/lib/gitlab/database/migration_helpers.rb +++ b/lib/gitlab/database/migration_helpers.rb @@ -20,11 +20,19 @@ module Gitlab if Database.postgresql? options = options.merge({ algorithm: :concurrently }) + disable_statement_timeout end add_index(table_name, column_name, options) end + # Long-running migrations may take more than the timeout allowed by + # the database. Disable the session's statement timeout to ensure + # migrations don't get killed prematurely. (PostgreSQL only) + def disable_statement_timeout + ActiveRecord::Base.connection.execute('SET statement_timeout TO 0') if Database.postgresql? + end + # Updates the value of a column in batches. # # This method updates the table in batches of 5% of the total row count. @@ -133,6 +141,8 @@ module Gitlab 'in the body of your migration class' end + disable_statement_timeout + transaction do add_column(table, column, type, default: nil) |