Merge branch 'rename-geo-download-dispatch-worker'

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_download_dispatch 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

@@ -1406,7 +1406,7 @@ external_url 'GENERATED_EXTERNAL_URL'
 #
 # gitlab_rails['geo_bulk_notify_worker_cron'] = "*/10 * * * * *"
 # gitlab_rails['geo_backfill_worker_cron'] = "*/5 * * * *"
-# gitlab_rails['geo_download_dispatch_worker_cron'] = "*/10 * * * *"
+# gitlab_rails['geo_file_download_dispatch_worker_cron'] = "*/10 * * * *"
 # gitlab_rails['ldap_sync_worker_cron'] = "30 1 * * *"
 # gitlab_rails['ldap_group_sync_worker_cron'] = "0 * * * *"
 # gitlab_rails['historical_data_worker_cron'] = "0 12 * * *"

files/gitlab-cookbooks/gitlab/attributes/default.rb

@@ -112,7 +112,7 @@ 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_download_dispatch_worker_cron'] = nil
+default['gitlab']['gitlab-rails']['geo_file_download_dispatch_worker_cron'] = nil
 default['gitlab']['gitlab-rails']['incoming_email_enabled'] = false
 default['gitlab']['gitlab-rails']['incoming_email_address'] = nil
 default['gitlab']['gitlab-rails']['incoming_email_host'] = nil

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

@@ -224,11 +224,11 @@ production: &base
       cron: "<%= @geo_backfill_worker_cron %>"
     <% end %>
-    # GitLab Geo file download worker
+    # GitLab Geo file download dispatch worker
     # NOTE: This will only take effect if Geo is enabled
-    <% unless @geo_download_dispatch_worker_cron.nil? %>
-    geo_download_dispatch_worker:
-      cron: "<%= @geo_download_dispatch_worker_cron %>"
+    <% unless @geo_file_download_dispatch_worker_cron.nil? %>
+    geo_file_download_dispatch_worker:
+      cron: "<%= @geo_file_download_dispatch_worker_cron %>"
     <% end %>
   #

spec/chef/recipes/gitlab-rails_spec.rb

@@ -192,19 +192,19 @@ describe 'gitlab::gitlab-rails' do
         end
       end
-      context 'when file download worker is configured' do
+      context 'when file download dispatch worker is configured' do
         it 'sets the cron value' do
-          stub_gitlab_rb(gitlab_rails: { geo_download_dispatch_worker_cron: '1 2 3 4 5' })
+          stub_gitlab_rb(gitlab_rails: { geo_file_download_dispatch_worker_cron: '1 2 3 4 5' })
           expect(chef_run).to render_file(gitlab_yml_path)
-            .with_content(/geo_download_dispatch_worker:\s+cron:\s+"1 2 3 4 5"/)
+            .with_content(/geo_file_download_dispatch_worker:\s+cron:\s+"1 2 3 4 5"/)
         end
       end
-      context 'when file download worker is not configured' do
+      context 'when file download dispatch 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_download_dispatch_worker')
+            expect(content).not_to include('geo_file_download_dispatch_worker')
           }
         end
       end