diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2017-03-16 11:43:15 +0000 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2017-03-16 11:43:15 +0000 |
commit | 8c5a3ffe9d29767eaf2e75038056efe29579b7bf (patch) | |
tree | 38ffc1551f87a863215940bf2b57c31f7fd0a8bc | |
parent | 3735266d844465c33294983538928afbe3f2c080 (diff) | |
parent | 0e9a5e73ca40a32507c8771dc8e650a0fb853c4b (diff) | |
download | gitlab-ce-8c5a3ffe9d29767eaf2e75038056efe29579b7bf.tar.gz |
Merge branch 'fix/gb/fix-timeouts-in-manual-actions-migration' into 'master'
Fix statements timeout in manual actions migration
Closes #29526
See merge request !9989
-rw-r--r-- | db/post_migrate/20170306170512_migrate_legacy_manual_actions.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/db/post_migrate/20170306170512_migrate_legacy_manual_actions.rb b/db/post_migrate/20170306170512_migrate_legacy_manual_actions.rb index 9020e0d054c..ec6e8cdfc45 100644 --- a/db/post_migrate/20170306170512_migrate_legacy_manual_actions.rb +++ b/db/post_migrate/20170306170512_migrate_legacy_manual_actions.rb @@ -4,6 +4,8 @@ class MigrateLegacyManualActions < ActiveRecord::Migration DOWNTIME = false def up + disable_statement_timeout + execute <<-EOS UPDATE ci_builds SET status = 'manual', allow_failure = true WHERE ci_builds.when = 'manual' AND ci_builds.status = 'skipped'; @@ -11,6 +13,8 @@ class MigrateLegacyManualActions < ActiveRecord::Migration end def down + disable_statement_timeout + execute <<-EOS UPDATE ci_builds SET status = 'skipped', allow_failure = false WHERE ci_builds.when = 'manual' AND ci_builds.status = 'manual'; |