Merge branch '2296-rename-geo-download-dispatch-worker' into 'master'

Make cron job name consistent with GeoFileDownloadDispatchWorker

Closes #2296

See merge request !1884

config/gitlab.yml.example

@@ -221,9 +221,9 @@ production: &base
     geo_repository_sync_worker:
       cron: "*/5 * * * *"
 
-    # GitLab Geo file download worker
+    # GitLab Geo file download dispatch worker
     # NOTE: This will only take effect if Geo is enabled
-    geo_download_dispatch_worker:
+    geo_file_download_dispatch_worker:
       cron: "*/10 * * * *"
 
   registry:

config/initializers/1_settings.rb

@@ -399,9 +399,9 @@ Settings.cron_jobs['geo_bulk_notify_worker']['job_class'] ||= 'GeoBulkNotifyWork
 Settings.cron_jobs['geo_repository_sync_worker'] ||= Settingslogic.new({})
 Settings.cron_jobs['geo_repository_sync_worker']['cron'] ||= '*/5 * * * *'
 Settings.cron_jobs['geo_repository_sync_worker']['job_class'] ||= 'GeoRepositorySyncWorker'
-Settings.cron_jobs['geo_download_dispatch_worker'] ||= Settingslogic.new({})
-Settings.cron_jobs['geo_download_dispatch_worker']['cron'] ||= '5 * * * *'
-Settings.cron_jobs['geo_download_dispatch_worker']['job_class'] ||= 'GeoFileDownloadDispatchWorker'
+Settings.cron_jobs['geo_file_download_dispatch_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['geo_file_download_dispatch_worker']['cron'] ||= '5 * * * *'
+Settings.cron_jobs['geo_file_download_dispatch_worker']['job_class'] ||= 'GeoFileDownloadDispatchWorker'
 Settings.cron_jobs['gitlab_usage_ping_worker'] ||= Settingslogic.new({})
 Settings.cron_jobs['gitlab_usage_ping_worker']['cron'] ||= Settings.send(:cron_random_weekly_time)
 Settings.cron_jobs['gitlab_usage_ping_worker']['job_class'] = 'GitlabUsagePingWorker'

lib/gitlab/geo.rb

@@ -79,7 +79,7 @@ module Gitlab
     end
 
     def self.file_download_job
-      Sidekiq::Cron::Job.find('geo_download_dispatch_worker')
+      Sidekiq::Cron::Job.find('geo_file_download_dispatch_worker')
     end
 
     def self.configure_primary_jobs!

spec/lib/gitlab/geo_spec.rb

@@ -122,11 +122,8 @@ describe Gitlab::Geo, lib: true do
     end
 
     before(:all) do
-      jobs = %w(geo_bulk_notify_worker geo_repository_sync_worker)
-
+      jobs = %w(geo_bulk_notify_worker geo_repository_sync_worker geo_file_download_dispatch_worker)
       jobs.each { |job| init_cron_job(job, job.camelize) }
-      # TODO: Make this name consistent
-      init_cron_job('geo_download_dispatch_worker', 'GeoFileDownloadDispatchWorker')
     end
 
     it 'activates cron jobs for primary' do