Merge branch '9-2-stable-fix-conflicts-for-mr-11593' into '9-2-stable'

Fix 9.2 conflicts for "Fixes broken MySQL migration for retried"

See merge request !11600

2 files changed, 67 insertions, 13 deletions

diff --git a/db/post_migrate/20170503004427_upate_retried_for_ci_build.rb b/db/post_migrate/20170503004427_upate_retried_for_ci_build.rb
index 80215d662e4..3096c54acb7 100644
--- a/db/post_migrate/20170503004427_upate_retried_for_ci_build.rb
+++ b/db/post_migrate/20170503004427_upate_retried_for_ci_build.rb
@@ -2,28 +2,65 @@ class UpateRetriedForCiBuild < ActiveRecord::Migration
   include Gitlab::Database::MigrationHelpers
 
   DOWNTIME = false
-  
+
   disable_ddl_transaction!
 
   def up
     disable_statement_timeout
 
-    latest_id = <<-SQL.strip_heredoc
-      SELECT MAX(ci_builds2.id)
-        FROM ci_builds ci_builds2
-        WHERE ci_builds.commit_id=ci_builds2.commit_id
-          AND ci_builds.name=ci_builds2.name
+    if Gitlab::Database.mysql?
+      up_mysql
+    else
+      up_postgres
+    end
+  end
+
+  def down
+  end
+
+  private
+
+  def up_mysql
+    # This is a trick to overcome MySQL limitation:
+    # Mysql2::Error: Table 'ci_builds' is specified twice, both as a target for 'UPDATE' and as a separate source for data
+    # However, this leads to create a temporary table from `max(ci_builds.id)` which is slow and do full database update
+    execute <<-SQL.strip_heredoc
+      UPDATE ci_builds SET retried=
+        (id NOT IN (
+          SELECT * FROM (SELECT MAX(ci_builds.id) FROM ci_builds GROUP BY commit_id, name) AS latest_jobs
+        ))
+      WHERE retried IS NULL
     SQL
-    
-    # This is slow update as it does single-row query
-    # This is designed to be run as idle, or a post deployment migration
-    is_retried = Arel.sql("((#{latest_id}) != ci_builds.id)")
+  end
+
+  def up_postgres
+    with_temporary_partial_index do
+      latest_id = <<-SQL.strip_heredoc
+        SELECT MAX(ci_builds2.id)
+          FROM ci_builds ci_builds2
+          WHERE ci_builds.commit_id=ci_builds2.commit_id
+            AND ci_builds.name=ci_builds2.name
+      SQL
 
-    update_column_in_batches(:ci_builds, :retried, is_retried) do |table, query|
-      query.where(table[:retried].eq(nil))
+      # This is slow update as it does single-row query
+      # This is designed to be run as idle, or a post deployment migration
+      is_retried = Arel.sql("((#{latest_id}) != ci_builds.id)")
+
+      update_column_in_batches(:ci_builds, :retried, is_retried) do |table, query|
+        query.where(table[:retried].eq(nil))
+      end
     end
   end
 
-  def down
+  def with_temporary_partial_index
+    if Gitlab::Database.postgresql?
+      execute 'CREATE INDEX CONCURRENTLY IF NOT EXISTS index_for_ci_builds_retried_migration ON ci_builds (id) WHERE retried IS NULL;'
+    end
+
+    yield
+
+    if Gitlab::Database.postgresql?
+      execute 'DROP INDEX CONCURRENTLY IF EXISTS index_for_ci_builds_retried_migration'
+    end
   end
 end
diff --git a/spec/migrations/upate_retried_for_ci_builds_spec.rb b/spec/migrations/upate_retried_for_ci_builds_spec.rb
new file mode 100644
index 00000000000..5cdb8a3c7da
--- /dev/null
+++ b/spec/migrations/upate_retried_for_ci_builds_spec.rb
@@ -0,0 +1,17 @@
+require 'spec_helper'
+require Rails.root.join('db', 'post_migrate', '20170503004427_upate_retried_for_ci_build.rb')
+
+describe UpateRetriedForCiBuild, truncate: true do
+  let(:pipeline) { create(:ci_pipeline) }
+  let!(:build_old) { create(:ci_build, pipeline: pipeline, name: 'test') }
+  let!(:build_new) { create(:ci_build, pipeline: pipeline, name: 'test') }
+
+  before do
+    described_class.new.up
+  end
+
+  it 'updates ci_builds.is_retried' do
+    expect(build_old.reload).to be_retried
+    expect(build_new.reload).not_to be_retried
+  end
+end