Merge branch 'sh-geo-cleanup-sidekiq-naming' into 'master'

Move All Geo Sidekiq workers to geo namespace

Closes #4868

See merge request gitlab-org/gitlab-ee!4459

app/workers/all_queues.yml

@@ -114,12 +114,16 @@
 - cronjob:ldap_sync
 - cronjob:update_all_mirrors
 
+- geo:geo_base_scheduler
+- geo:geo_file_download
 - geo:geo_file_removal
 - geo:geo_hashed_storage_attachments_migration
 - geo:geo_hashed_storage_migration
+- geo:geo_project_sync
 - geo:geo_rename_repository
 - geo:geo_repositories_clean_up
 - geo:geo_repository_destroy
+- geo:geo_repository_shard_sync
 
 - object_storage_upload
 - object_storage:object_storage_background_move
@@ -130,10 +134,6 @@
 - elastic_commit_indexer
 - elastic_indexer
 - export_csv
-- geo_base_scheduler
-- geo_file_download
-- geo_project_sync
-- geo_repository_shard_sync
 - ldap_group_sync
 - project_update_repository_storage
 - rebase

config/sidekiq_queues.yml

@@ -76,10 +76,6 @@
   - [repository_update_remote_mirror, 1]
   - [project_update_repository_storage, 1]
   - [admin_emails, 1]
-  - [geo_base_scheduler, 1] # Parent class of geo_repository_shard_sync and cronjob:geo_file_download_dispatch
-  - [geo_project_sync, 1]
-  - [geo_file_download, 1]
-  - [geo_repository_shard_sync, 1]
   - [elastic_batch_project_indexer, 1]
   - [elastic_indexer, 1]
   - [elastic_commit_indexer, 1]

ee/app/workers/geo/base_scheduler_worker.rb

 module Geo
   class BaseSchedulerWorker
     include ApplicationWorker
+    include GeoQueue
     include ExclusiveLeaseGuard
     include ::Gitlab::Utils::StrongMemoize
 

ee/app/workers/geo/file_download_worker.rb

 module Geo
   class FileDownloadWorker
     include ApplicationWorker
+    include GeoQueue
 
     sidekiq_options retry: 3, dead: false
 

ee/app/workers/geo/project_sync_worker.rb

 module Geo
   class ProjectSyncWorker
     include ApplicationWorker
+    include GeoQueue
 
     sidekiq_options retry: 3, dead: false