summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-06-28 12:01:52 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-07-07 15:07:29 +0200
commitb7d672328db358690d043aae8b5fc24c358a52ab (patch)
treec3c79c0c0e39a93e8475d88cd8190a98e65cfe17
parent16ae7b7a49314b2525f3f32c07dd8a4891fa74e1 (diff)
downloadgitlab-ce-b7d672328db358690d043aae8b5fc24c358a52ab.tar.gz
Add initial build stage_id ref background migration
-rw-r--r--db/post_migrate/20170628080858_migrate_stage_id_reference_in_background.rb10
-rw-r--r--lib/gitlab/background_migration/migrate_build_stage_id_reference.rb18
-rw-r--r--spec/migrations/migrate_stage_id_reference_in_background_spec.rb5
3 files changed, 26 insertions, 7 deletions
diff --git a/db/post_migrate/20170628080858_migrate_stage_id_reference_in_background.rb b/db/post_migrate/20170628080858_migrate_stage_id_reference_in_background.rb
index 2eaa798d0aa..44bac4a8cc7 100644
--- a/db/post_migrate/20170628080858_migrate_stage_id_reference_in_background.rb
+++ b/db/post_migrate/20170628080858_migrate_stage_id_reference_in_background.rb
@@ -3,7 +3,17 @@ class MigrateStageIdReferenceInBackground < ActiveRecord::Migration
DOWNTIME = false
+ disable_ddl_transaction!
+
+ class Build < ActiveRecord::Base
+ self.table_name = 'ci_builds'
+ end
+
def up
+ Build.find_each do |build|
+ BackgroundMigrationWorker
+ .perform_async('MigrateBuildStageIdReference', [build.id])
+ end
end
def down
diff --git a/lib/gitlab/background_migration/migrate_build_stage_id_reference.rb b/lib/gitlab/background_migration/migrate_build_stage_id_reference.rb
index b554c3e079b..87c6c4ed49f 100644
--- a/lib/gitlab/background_migration/migrate_build_stage_id_reference.rb
+++ b/lib/gitlab/background_migration/migrate_build_stage_id_reference.rb
@@ -1,15 +1,19 @@
module Gitlab
module BackgroundMigration
class MigrateBuildStageIdReference
- class Build < ActiveRecord::Base
- self.table_name = 'ci_builds'
- end
+ def perform(id)
+ raise ArgumentError unless id.is_a?(Integer)
- class Stage < ActiveRecord::Base
- self.table_name = 'ci_stages'
- end
+ sql = <<-SQL.strip_heredoc
+ UPDATE "ci_builds" SET "stage_id" = (
+ SELECT id FROM ci_stages
+ WHERE ci_stages.pipeline_id = ci_builds.commit_id
+ AND ci_stages.name = ci_builds.stage
+ )
+ WHERE "ci_builds"."id" = #{id} AND "ci_builds"."stage_id" IS NULL
+ SQL
- def perform(id)
+ ActiveRecord::Base.connection.execute(sql)
end
end
end
diff --git a/spec/migrations/migrate_stage_id_reference_in_background_spec.rb b/spec/migrations/migrate_stage_id_reference_in_background_spec.rb
index f86ef834afa..ea3a18802d9 100644
--- a/spec/migrations/migrate_stage_id_reference_in_background_spec.rb
+++ b/spec/migrations/migrate_stage_id_reference_in_background_spec.rb
@@ -22,5 +22,10 @@ describe MigrateStageIdReferenceInBackground, :migration, :redis do
end
it 'schedules background migrations' do
+ expect(jobs.where(stage_id: nil)).to be_present
+
+ migrate!
+
+ expect(jobs.where(stage_id: nil)).to be_empty
end
end