Merge branch 'backstage/gb/steal-stages-statuses-migration' into 'master'

Steal stages statuses migration

Closes #37694

See merge request gitlab-org/gitlab-ce!14217

2 files changed, 77 insertions, 0 deletions

diff --git a/db/migrate/20170912113435_clean_stages_statuses_migration.rb b/db/migrate/20170912113435_clean_stages_statuses_migration.rb
new file mode 100644
index 00000000000..fc091d7894e
--- /dev/null
+++ b/db/migrate/20170912113435_clean_stages_statuses_migration.rb
@@ -0,0 +1,26 @@
+class CleanStagesStatusesMigration < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  class Stage < ActiveRecord::Base
+    include ::EachBatch
+    self.table_name = 'ci_stages'
+  end
+
+  def up
+    Gitlab::BackgroundMigration.steal('MigrateStageStatus')
+
+    Stage.where('status IS NULL').each_batch(of: 50) do |batch|
+      range = batch.pluck('MIN(id)', 'MAX(id)').first
+
+      Gitlab::BackgroundMigration::MigrateStageStatus.new.perform(*range)
+    end
+  end
+
+  def down
+    # noop
+  end
+end
diff --git a/spec/migrations/clean_stages_statuses_migration_spec.rb b/spec/migrations/clean_stages_statuses_migration_spec.rb
new file mode 100644
index 00000000000..38705f8eaae
--- /dev/null
+++ b/spec/migrations/clean_stages_statuses_migration_spec.rb
@@ -0,0 +1,51 @@
+require 'spec_helper'
+require Rails.root.join('db', 'migrate', '20170912113435_clean_stages_statuses_migration.rb')
+
+describe CleanStagesStatusesMigration, :migration, :sidekiq, :redis do
+  let(:migration) { spy('migration') }
+
+  before do
+    allow(Gitlab::BackgroundMigration::MigrateStageStatus)
+      .to receive(:new).and_return(migration)
+  end
+
+  context 'when there are pending background migrations' do
+    it 'processes pending jobs synchronously' do
+      Sidekiq::Testing.disable! do
+        BackgroundMigrationWorker
+          .perform_in(2.minutes, 'MigrateStageStatus', [1, 1])
+        BackgroundMigrationWorker
+          .perform_async('MigrateStageStatus', [1, 1])
+
+        migrate!
+
+        expect(migration).to have_received(:perform).with(1, 1).twice
+      end
+    end
+  end
+
+  context 'when there are no background migrations pending' do
+    it 'does nothing' do
+      Sidekiq::Testing.disable! do
+        migrate!
+
+        expect(migration).not_to have_received(:perform)
+      end
+    end
+  end
+
+  context 'when there are still unmigrated stages afterwards' do
+    let(:stages) { table('ci_stages') }
+
+    before do
+      stages.create!(status: nil, name: 'build')
+      stages.create!(status: nil, name: 'test')
+    end
+
+    it 'migrates statuses sequentially in batches' do
+      migrate!
+
+      expect(migration).to have_received(:perform).once
+    end
+  end
+end