Commit 7f31768a authored by Timothy Andrew's avatar Timothy Andrew

Merge branch 'fix-retried-for-mysql' into 'master'

Fixes broken MySQL migration for retried

Closes #32647

See merge request !11593
parents b94398e9 cbafe24a
...@@ -8,6 +8,32 @@ class UpateRetriedForCiBuild < ActiveRecord::Migration ...@@ -8,6 +8,32 @@ class UpateRetriedForCiBuild < ActiveRecord::Migration
def up def up
disable_statement_timeout disable_statement_timeout
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
end
def up_postgres
with_temporary_partial_index do with_temporary_partial_index do
latest_id = <<-SQL.strip_heredoc latest_id = <<-SQL.strip_heredoc
SELECT MAX(ci_builds2.id) SELECT MAX(ci_builds2.id)
...@@ -26,9 +52,6 @@ class UpateRetriedForCiBuild < ActiveRecord::Migration ...@@ -26,9 +52,6 @@ class UpateRetriedForCiBuild < ActiveRecord::Migration
end end
end end
def down
end
def with_temporary_partial_index def with_temporary_partial_index
if Gitlab::Database.postgresql? 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;' execute 'CREATE INDEX CONCURRENTLY IF NOT EXISTS index_for_ci_builds_retried_migration ON ci_builds (id) WHERE retried IS NULL;'
......
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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment