Commit 2b778174 authored by Robert Speicher's avatar Robert Speicher

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

Make cron job name consistent with GeoFileDownloadDispatchWorker

Closes #2296

See merge request !1884
parents d702e3e9 cfb62a4c
...@@ -221,9 +221,9 @@ production: &base ...@@ -221,9 +221,9 @@ production: &base
geo_repository_sync_worker: geo_repository_sync_worker:
cron: "*/5 * * * *" cron: "*/5 * * * *"
# GitLab Geo file download worker # GitLab Geo file download dispatch worker
# NOTE: This will only take effect if Geo is enabled # NOTE: This will only take effect if Geo is enabled
geo_download_dispatch_worker: geo_file_download_dispatch_worker:
cron: "*/10 * * * *" cron: "*/10 * * * *"
registry: registry:
......
...@@ -399,9 +399,9 @@ Settings.cron_jobs['geo_bulk_notify_worker']['job_class'] ||= 'GeoBulkNotifyWork ...@@ -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'] ||= Settingslogic.new({})
Settings.cron_jobs['geo_repository_sync_worker']['cron'] ||= '*/5 * * * *' Settings.cron_jobs['geo_repository_sync_worker']['cron'] ||= '*/5 * * * *'
Settings.cron_jobs['geo_repository_sync_worker']['job_class'] ||= 'GeoRepositorySyncWorker' Settings.cron_jobs['geo_repository_sync_worker']['job_class'] ||= 'GeoRepositorySyncWorker'
Settings.cron_jobs['geo_download_dispatch_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['geo_file_download_dispatch_worker'] ||= Settingslogic.new({})
Settings.cron_jobs['geo_download_dispatch_worker']['cron'] ||= '5 * * * *' Settings.cron_jobs['geo_file_download_dispatch_worker']['cron'] ||= '5 * * * *'
Settings.cron_jobs['geo_download_dispatch_worker']['job_class'] ||= 'GeoFileDownloadDispatchWorker' 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'] ||= Settingslogic.new({})
Settings.cron_jobs['gitlab_usage_ping_worker']['cron'] ||= Settings.send(:cron_random_weekly_time) Settings.cron_jobs['gitlab_usage_ping_worker']['cron'] ||= Settings.send(:cron_random_weekly_time)
Settings.cron_jobs['gitlab_usage_ping_worker']['job_class'] = 'GitlabUsagePingWorker' Settings.cron_jobs['gitlab_usage_ping_worker']['job_class'] = 'GitlabUsagePingWorker'
......
...@@ -79,7 +79,7 @@ module Gitlab ...@@ -79,7 +79,7 @@ module Gitlab
end end
def self.file_download_job def self.file_download_job
Sidekiq::Cron::Job.find('geo_download_dispatch_worker') Sidekiq::Cron::Job.find('geo_file_download_dispatch_worker')
end end
def self.configure_primary_jobs! def self.configure_primary_jobs!
......
...@@ -122,11 +122,8 @@ describe Gitlab::Geo, lib: true do ...@@ -122,11 +122,8 @@ describe Gitlab::Geo, lib: true do
end end
before(:all) do 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) } jobs.each { |job| init_cron_job(job, job.camelize) }
# TODO: Make this name consistent
init_cron_job('geo_download_dispatch_worker', 'GeoFileDownloadDispatchWorker')
end end
it 'activates cron jobs for primary' do it 'activates cron jobs for primary' do
......
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