diff --git a/CHANGELOG.md b/CHANGELOG.md index cf7780e3e54e47ac5045e59b795e5378c0a8d3a9..301e564573a661285a81e9ba20657330035c143a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ The latest version of this file can be found at the master branch of the omnibus-gitlab repository. +9.3.0 + +- Rename geo_backfill worker configuration + 9.2.0 - Update mysql client to 5.5.55 diff --git a/files/gitlab-config-template/gitlab.rb.template b/files/gitlab-config-template/gitlab.rb.template index b9c1446045ea00d44824f89e50c958f674fe7eef..488f551755ab550eda6765b02591199065b1a4cc 100644 --- a/files/gitlab-config-template/gitlab.rb.template +++ b/files/gitlab-config-template/gitlab.rb.template @@ -1396,7 +1396,7 @@ external_url 'GENERATED_EXTERNAL_URL' ################################################################################ # # gitlab_rails['geo_bulk_notify_worker_cron'] = "*/10 * * * * *" -# gitlab_rails['geo_backfill_worker_cron'] = "*/5 * * * *" +# gitlab_rails['geo_repository_sync_worker_cron'] = "*/5 * * * *" # gitlab_rails['geo_download_dispatch_worker_cron'] = "*/10 * * * *" # gitlab_rails['ldap_sync_worker_cron'] = "30 1 * * *" # gitlab_rails['ldap_group_sync_worker_cron'] = "0 * * * *" diff --git a/files/gitlab-cookbooks/gitlab/attributes/default.rb b/files/gitlab-cookbooks/gitlab/attributes/default.rb index 1816592c254f3f3ebe057da125d190963fdbb1ca..ef34e36766c7d1ef608723fdc93c87232d8fc61b 100644 --- a/files/gitlab-cookbooks/gitlab/attributes/default.rb +++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb @@ -111,7 +111,7 @@ default['gitlab']['gitlab-rails']['historical_data_worker_cron'] = nil default['gitlab']['gitlab-rails']['ldap_sync_worker_cron'] = nil default['gitlab']['gitlab-rails']['ldap_group_sync_worker_cron'] = nil default['gitlab']['gitlab-rails']['geo_bulk_notify_worker_cron'] = nil -default['gitlab']['gitlab-rails']['geo_backfill_worker_cron'] = nil +default['gitlab']['gitlab-rails']['geo_repository_sync_worker_cron'] = nil default['gitlab']['gitlab-rails']['geo_download_dispatch_worker_cron'] = nil default['gitlab']['gitlab-rails']['incoming_email_enabled'] = false default['gitlab']['gitlab-rails']['incoming_email_address'] = nil diff --git a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb index 764257664e9e4d6bfa7cd8088cccfa608e6d768b..7cda2cc4f3fad6c21ea6e78e2ba388aa5aaea7d9 100644 --- a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb +++ b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb @@ -215,11 +215,11 @@ production: &base cron: "<%= @geo_bulk_notify_worker_cron %>" <% end %> - # GitLab Geo backfill worker + # GitLab Geo repository sync worker # NOTE: This will only take effect if Geo is enabled - <% unless @geo_backfill_worker_cron.nil? %> - geo_backfill_worker: - cron: "<%= @geo_backfill_worker_cron %>" + <% unless @geo_repository_sync_worker_cron.nil? %> + geo_repository_sync_worker: + cron: "<%= @geo_repository_sync_worker_cron %>" <% end %> # GitLab Geo file download worker diff --git a/spec/chef/recipes/gitlab-rails_spec.rb b/spec/chef/recipes/gitlab-rails_spec.rb index 9616a97ce435b9fdfd7df07c64d5bc1fcffbc3e7..a47f2f8a797a9df95c6c82f731c65a052d83384c 100644 --- a/spec/chef/recipes/gitlab-rails_spec.rb +++ b/spec/chef/recipes/gitlab-rails_spec.rb @@ -175,19 +175,19 @@ describe 'gitlab::gitlab-rails' do end context 'GitLab Geo settings' do - context 'when backfill worker is configured' do + context 'when repository sync worker is configured' do it 'sets the cron value' do - stub_gitlab_rb(gitlab_rails: { geo_backfill_worker_cron: '1 2 3 4 5' }) + stub_gitlab_rb(gitlab_rails: { geo_repository_sync_worker_cron: '1 2 3 4 5' }) expect(chef_run).to render_file(gitlab_yml_path) - .with_content(/geo_backfill_worker:\s+cron:\s+"1 2 3 4 5"/) + .with_content(/geo_repository_sync_worker:\s+cron:\s+"1 2 3 4 5"/) end end - context 'when backfill worker is not configured' do + context 'when repository sync worker is not configured' do it 'does not set the cron value' do expect(chef_run).to render_file(gitlab_yml_path).with_content { |content| - expect(content).not_to include('geo_backfill_worker') + expect(content).not_to include('geo_repository_sync_worker') } end end @@ -211,7 +211,7 @@ describe 'gitlab::gitlab-rails' do end context 'Scheduled Pipeline settings' do - context 'when the corn pattern is configured' do + context 'when the cron pattern is configured' do it 'sets the cron value' do stub_gitlab_rb(gitlab_rails: { trigger_schedule_worker_cron: '1 2 3 4 5' }) @@ -219,14 +219,6 @@ describe 'gitlab::gitlab-rails' do .with_content(/trigger_schedule_worker:\s+cron:\s+"1 2 3 4 5"/) end end - - context 'when backfill worker is not configured' do - it 'does not set the cron value' do - expect(chef_run).to render_file(gitlab_yml_path).with_content { |content| - expect(content).not_to include('geo_backfill_worker') - } - end - end end context 'Gitaly settings' do