Merge branch 'rename-backfill-worker' into 'master'

Rename geo_backfill worker configuration

See merge request !1548

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
 - Add a missing symlink for /opt/gitlab/init/sshd to make `gitlab-ctl stop` work in Docker 4a098168

files/gitlab-config-template/gitlab.rb.template

@@ -1405,7 +1405,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 * * * *"

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

files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb

@@ -217,11 +217,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

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: { pipeline_schedule_worker_cron: '41 * * * *' })
@@ -219,14 +219,6 @@ describe 'gitlab::gitlab-rails' do
             .with_content(/pipeline_schedule_worker:\s+cron:\s+"41/)
         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