Commit be375010 authored by Stan Hu's avatar Stan Hu

Add back deprecated Geo queues that were removed in 10.6

We need to drain these queues before we can remove them completely.
Since the Log Cursor may be writing to these queues until it is
restarted, we can't guarantee that a Redis migration will properly
migrate everything.

Closes #5219
parent 87433f2f
...@@ -107,6 +107,13 @@ ...@@ -107,6 +107,13 @@
- web_hook - web_hook
# EE-specific queues # EE-specific queues
# Deprecated queues: remove after 10.7
- geo_base_scheduler
- geo_file_download
- geo_project_sync
- geo_repository_shard_sync
- cronjob:clear_shared_runners_minutes - cronjob:clear_shared_runners_minutes
- cronjob:geo_file_download_dispatch - cronjob:geo_file_download_dispatch
- cronjob:geo_metrics_update - cronjob:geo_metrics_update
......
...@@ -88,3 +88,9 @@ ...@@ -88,3 +88,9 @@
- [export_csv, 1] - [export_csv, 1]
- [object_storage_upload, 1] - [object_storage_upload, 1]
- [object_storage, 1] - [object_storage, 1]
# Deprecated queues: Remove after 10.7
- geo_base_scheduler
- geo_file_download
- geo_project_sync
- geo_repository_shard_sync
require 'spec_helper' require 'spec_helper'
describe 'Every Sidekiq worker' do describe 'Every Sidekiq worker' do
DEPRECATED_QUEUES = %w(geo_base_scheduler geo_file_download geo_project_sync geo_repository_shard_sync).freeze
it 'does not use the default queue' do it 'does not use the default queue' do
expect(Gitlab::SidekiqConfig.workers.map(&:queue)).not_to include('default') expect(Gitlab::SidekiqConfig.workers.map(&:queue)).not_to include('default')
end end
...@@ -16,10 +18,10 @@ describe 'Every Sidekiq worker' do ...@@ -16,10 +18,10 @@ describe 'Every Sidekiq worker' do
worker_queues << ActionMailer::DeliveryJob.queue_name worker_queues << ActionMailer::DeliveryJob.queue_name
worker_queues << 'default' worker_queues << 'default'
missing_from_file = worker_queues - file_worker_queues missing_from_file = worker_queues - file_worker_queues - DEPRECATED_QUEUES
expect(missing_from_file).to be_empty, "expected #{missing_from_file.to_a.inspect} to be in app/workers/all_queues.yml" expect(missing_from_file).to be_empty, "expected #{missing_from_file.to_a.inspect} to be in app/workers/all_queues.yml"
unncessarily_in_file = file_worker_queues - worker_queues unncessarily_in_file = file_worker_queues - worker_queues - DEPRECATED_QUEUES
expect(unncessarily_in_file).to be_empty, "expected #{unncessarily_in_file.to_a.inspect} not to be in app/workers/all_queues.yml" expect(unncessarily_in_file).to be_empty, "expected #{unncessarily_in_file.to_a.inspect} not to be in app/workers/all_queues.yml"
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