diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-09 20:30:09 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-09 20:30:09 +0300 |
| commit | 858d175c1527d650ea5d83e201777d0cf8ae84c9 (patch) | |
| tree | 147344d5699ea84eda6f980867e4d2045e0f22b9 /config | |
| parent | f6262510e6642bb91d112f1bf2ea70db8b7b772c (diff) | |
Add latest changes from gitlab-org/gitlab@15-9-stable-ee
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 7 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 5a9811c0e91..c89db25c347 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -628,11 +628,16 @@ production: &base geo_secondary_registry_consistency_worker: cron: "* * * * *" - # GitLab Geo registry sync worker (for backfilling) + # GitLab Geo blob registry sync worker (for backfilling) # NOTE: This will only take effect if Geo is enabled (secondary nodes only) geo_registry_sync_worker: cron: "*/1 * * * *" + # GitLab Geo repository registry sync worker (for backfilling) + # NOTE: This will only take effect if Geo is enabled (secondary nodes only) + geo_repository_registry_sync_worker: + cron: "*/1 * * * *" + # Elasticsearch bulk updater for incremental updates. # NOTE: This will only take effect if elasticsearch is enabled. elastic_index_bulk_cron_worker: diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index b05fa6c1d8d..a1637d8c339 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -721,6 +721,9 @@ Gitlab.ee do Settings.cron_jobs['geo_registry_sync_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['geo_registry_sync_worker']['cron'] ||= '*/1 * * * *' Settings.cron_jobs['geo_registry_sync_worker']['job_class'] ||= 'Geo::RegistrySyncWorker' + Settings.cron_jobs['geo_repository_registry_sync_worker'] ||= Settingslogic.new({}) + Settings.cron_jobs['geo_repository_registry_sync_worker']['cron'] ||= '*/1 * * * *' + Settings.cron_jobs['geo_repository_registry_sync_worker']['job_class'] ||= 'Geo::RepositoryRegistrySyncWorker' Settings.cron_jobs['geo_metrics_update_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['geo_metrics_update_worker']['cron'] ||= '*/1 * * * *' Settings.cron_jobs['geo_metrics_update_worker']['job_class'] ||= 'Geo::MetricsUpdateWorker' |