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

Merge branch 'fix/gb/fix-timeouts-in-manual-actions-migration' into 'master'
1eb7df0e · Yorick Peterse · Lin Jen-Shin · c0baaec2 · 1eb7df0e
Commit 1eb7df0e authored Mar 16, 2017 by Yorick Peterse Committed by Lin Jen-Shin Mar 16, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

20170306170512_migrate_legacy_manual_actions.rb ...t_migrate/20170306170512_migrate_legacy_manual_actions.rb +4 -0

No files found.
--- 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';