Move update_head_pipeline_for_merge_request queue to pipeline_processing namespace
This commit is contained in:
parent
2a97550d2f
commit
10f135cf8a
|
@ -48,7 +48,6 @@
|
|||
- pipeline_default:build_trace_sections
|
||||
- pipeline_default:pipeline_metrics
|
||||
- pipeline_default:pipeline_notification
|
||||
- pipeline_default:update_head_pipeline_for_merge_request
|
||||
- pipeline_hooks:build_hooks
|
||||
- pipeline_hooks:pipeline_hooks
|
||||
- pipeline_processing:build_finished
|
||||
|
@ -58,6 +57,7 @@
|
|||
- pipeline_processing:pipeline_success
|
||||
- pipeline_processing:pipeline_update
|
||||
- pipeline_processing:stage_update
|
||||
- pipeline_processing:update_head_pipeline_for_merge_request
|
||||
|
||||
- repository_check:repository_check_clear
|
||||
- repository_check:repository_check_single_repository
|
||||
|
|
|
@ -0,0 +1,15 @@
|
|||
class MigrateUpdateHeadPipelineForMergeRequestSidekiqQueue < ActiveRecord::Migration
|
||||
include Gitlab::Database::MigrationHelpers
|
||||
|
||||
DOWNTIME = false
|
||||
|
||||
def up
|
||||
sidekiq_queue_migrate 'pipeline_default:update_head_pipeline_for_merge_request',
|
||||
to: 'pipeline_processing:update_head_pipeline_for_merge_request'
|
||||
end
|
||||
|
||||
def down
|
||||
sidekiq_queue_migrate 'pipeline_processing:update_head_pipeline_for_merge_request',
|
||||
to: 'pipeline_default:update_head_pipeline_for_merge_request'
|
||||
end
|
||||
end
|
|
@ -11,7 +11,7 @@
|
|||
#
|
||||
# It's strongly recommended that you check this file into your version control system.
|
||||
|
||||
ActiveRecord::Schema.define(version: 20180306074045) do
|
||||
ActiveRecord::Schema.define(version: 20180307012445) do
|
||||
|
||||
# These are extensions that must be enabled in order to support this database
|
||||
enable_extension "plpgsql"
|
||||
|
|
|
@ -0,0 +1,64 @@
|
|||
require 'spec_helper'
|
||||
require Rails.root.join('db', 'post_migrate', '20180307012445_migrate_update_head_pipeline_for_merge_request_sidekiq_queue.rb')
|
||||
|
||||
describe MigrateUpdateHeadPipelineForMergeRequestSidekiqQueue, :sidekiq, :redis do
|
||||
include Gitlab::Database::MigrationHelpers
|
||||
|
||||
context 'when there are jobs in the queues' do
|
||||
it 'correctly migrates queue when migrating up' do
|
||||
Sidekiq::Testing.disable! do
|
||||
stubbed_worker(queue: 'pipeline_default:update_head_pipeline_for_merge_request').perform_async('Something', [1])
|
||||
stubbed_worker(queue: 'pipeline_processing:update_head_pipeline_for_merge_request').perform_async('Something', [1])
|
||||
|
||||
described_class.new.up
|
||||
|
||||
expect(sidekiq_queue_length('pipeline_default:update_head_pipeline_for_merge_request')).to eq 0
|
||||
expect(sidekiq_queue_length('pipeline_processing:update_head_pipeline_for_merge_request')).to eq 2
|
||||
end
|
||||
end
|
||||
|
||||
it 'does not affect other queues under the same namespace' do
|
||||
Sidekiq::Testing.disable! do
|
||||
stubbed_worker(queue: 'pipeline_default:build_coverage').perform_async('Something', [1])
|
||||
stubbed_worker(queue: 'pipeline_default:build_trace_sections').perform_async('Something', [1])
|
||||
stubbed_worker(queue: 'pipeline_default:pipeline_metrics').perform_async('Something', [1])
|
||||
stubbed_worker(queue: 'pipeline_default:pipeline_notification').perform_async('Something', [1])
|
||||
|
||||
described_class.new.up
|
||||
|
||||
expect(sidekiq_queue_length('pipeline_default:build_coverage')).to eq 1
|
||||
expect(sidekiq_queue_length('pipeline_default:build_trace_sections')).to eq 1
|
||||
expect(sidekiq_queue_length('pipeline_default:pipeline_metrics')).to eq 1
|
||||
expect(sidekiq_queue_length('pipeline_default:pipeline_notification')).to eq 1
|
||||
end
|
||||
end
|
||||
|
||||
it 'correctly migrates queue when migrating down' do
|
||||
Sidekiq::Testing.disable! do
|
||||
stubbed_worker(queue: 'pipeline_processing:update_head_pipeline_for_merge_request').perform_async('Something', [1])
|
||||
|
||||
described_class.new.down
|
||||
|
||||
expect(sidekiq_queue_length('pipeline_default:update_head_pipeline_for_merge_request')).to eq 1
|
||||
expect(sidekiq_queue_length('pipeline_processing:update_head_pipeline_for_merge_request')).to eq 0
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'when there are no jobs in the queues' do
|
||||
it 'does not raise error when migrating up' do
|
||||
expect { described_class.new.up }.not_to raise_error
|
||||
end
|
||||
|
||||
it 'does not raise error when migrating down' do
|
||||
expect { described_class.new.down }.not_to raise_error
|
||||
end
|
||||
end
|
||||
|
||||
def stubbed_worker(queue:)
|
||||
Class.new do
|
||||
include Sidekiq::Worker
|
||||
sidekiq_options queue: queue
|
||||
end
|
||||
end
|
||||
end
|
Loading…
Reference in New Issue