diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-13 18:09:00 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-13 18:09:00 +0000 |
| commit | e4dffdfe364af6c72dcb6b4671cb39a24e8e100c (patch) | |
| tree | 6428a1c3472b14396645dcb280b219dbc0420c66 /config | |
| parent | 0ab47b994caa80c5587f33dc818626b66cfdafe2 (diff) | |
| download | gitlab-ce-e4dffdfe364af6c72dcb6b4671cb39a24e8e100c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 5 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 550973e19f7..9515ebaea62 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -432,6 +432,11 @@ production: &base geo_repository_sync_worker: cron: "*/1 * * * *" + # GitLab Geo registry backfill worker + # NOTE: This will only take effect if Geo is enabled (secondary nodes only) + geo_secondary_registry_consistency_worker: + cron: "* * * * *" + # GitLab Geo file download dispatch worker # NOTE: This will only take effect if Geo is enabled (secondary nodes only) geo_file_download_dispatch_worker: diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index a6fbb8608b3..76391983e6e 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -498,6 +498,9 @@ Gitlab.ee do Settings.cron_jobs['geo_repository_sync_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['geo_repository_sync_worker']['cron'] ||= '*/1 * * * *' Settings.cron_jobs['geo_repository_sync_worker']['job_class'] ||= 'Geo::RepositorySyncWorker' + Settings.cron_jobs['geo_secondary_registry_consistency_worker'] ||= Settingslogic.new({}) + Settings.cron_jobs['geo_secondary_registry_consistency_worker']['cron'] ||= '* * * * *' + Settings.cron_jobs['geo_secondary_registry_consistency_worker']['job_class'] ||= 'Geo::Secondary::RegistryConsistencyWorker' Settings.cron_jobs['geo_repository_verification_primary_batch_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['geo_repository_verification_primary_batch_worker']['cron'] ||= '*/1 * * * *' Settings.cron_jobs['geo_repository_verification_primary_batch_worker']['job_class'] ||= 'Geo::RepositoryVerification::Primary::BatchWorker' |