Commit f41c9966 authored by Stan Hu's avatar Stan Hu

Merge branch...

Merge branch '11692-geo-cron-job-to-perform-repository-checks-is-disabled-on-a-secondary-node' into 'master'

Geo: Enable Cron job to perform repository checks on a Geo secondary node

Closes #11692

See merge request gitlab-org/gitlab-ee!13103
parents e24224b3 72046f1f
---
title: Geo - Enable Cron job to perform repository checks on a Geo secondary node
merge_request: 13103
author:
type: fixed
...@@ -3,7 +3,10 @@ ...@@ -3,7 +3,10 @@
module Gitlab module Gitlab
module Geo module Geo
class CronManager class CronManager
COMMON_JOBS = %w[geo_metrics_update_worker].freeze COMMON_JOBS = %w[
geo_metrics_update_worker
repository_check_worker
].freeze
PRIMARY_JOBS = %w[ PRIMARY_JOBS = %w[
geo_prune_event_log_worker geo_prune_event_log_worker
...@@ -11,10 +14,10 @@ module Gitlab ...@@ -11,10 +14,10 @@ module Gitlab
].freeze ].freeze
SECONDARY_JOBS = %w[ SECONDARY_JOBS = %w[
geo_repository_sync_worker
geo_file_download_dispatch_worker geo_file_download_dispatch_worker
geo_repository_verification_secondary_scheduler_worker
geo_migrated_local_files_clean_up_worker geo_migrated_local_files_clean_up_worker
geo_repository_sync_worker
geo_repository_verification_secondary_scheduler_worker
].freeze ].freeze
GEO_JOBS = (COMMON_JOBS + PRIMARY_JOBS + SECONDARY_JOBS).freeze GEO_JOBS = (COMMON_JOBS + PRIMARY_JOBS + SECONDARY_JOBS).freeze
......
...@@ -29,6 +29,7 @@ describe Gitlab::Geo::CronManager, :geo do ...@@ -29,6 +29,7 @@ describe Gitlab::Geo::CronManager, :geo do
JOBS = %w[ JOBS = %w[
ldap_test ldap_test
repository_check_worker
geo_repository_verification_primary_batch_worker geo_repository_verification_primary_batch_worker
geo_repository_sync_worker geo_repository_sync_worker
geo_file_download_dispatch_worker geo_file_download_dispatch_worker
...@@ -46,7 +47,7 @@ describe Gitlab::Geo::CronManager, :geo do ...@@ -46,7 +47,7 @@ describe Gitlab::Geo::CronManager, :geo do
JOBS.each { |name| job(name)&.destroy } JOBS.each { |name| job(name)&.destroy }
end end
let(:common_jobs) { [job('geo_metrics_update_worker')] } let(:common_jobs) { [job('geo_metrics_update_worker'), job('repository_check_worker')] }
let(:ldap_test_job) { job('ldap_test') } let(:ldap_test_job) { job('ldap_test') }
let(:primary_jobs) { [job('geo_repository_verification_primary_batch_worker')] } let(:primary_jobs) { [job('geo_repository_verification_primary_batch_worker')] }
......
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