Merge branch 'tc-geo-migration-object-storage' into 'master'

Geo: Add cron job for migrated local files worker

See merge request gitlab-org/omnibus-gitlab!2380

CHANGELOG.md

@@ -6,6 +6,7 @@ omnibus-gitlab repository.
 10.7.0
 - Geo: Increase default WAL standby settings from 30s to 60s
 - Geo: Add support for creating a user for the  pgbouncer on the Geo DB
+- Geo: Add cron job for migrated local files worker
 - Disable 3DES ssl_ciphers of nginx for gitlab-rails, mattermost, pages, and
   registry (Takuya Noguchi)
 - Internal: Speed up rubocop job (Takuya Noguchi)

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

@@ -1539,6 +1539,7 @@ external_url 'GENERATED_EXTERNAL_URL'
 # gitlab_rails['geo_repository_sync_worker_cron'] = "*/5 * * * *"
 # gitlab_rails['geo_repository_verification_primary_batch_worker_cron'] = "*/5 * * * *"
 # gitlab_rails['geo_repository_verification_secondary_scheduler_worker_cron'] = "*/5 * * * *"
+# gitlab_rails['geo_migrated_local_files_clean_up_worker_cron'] = "15 */6 * * *"
 # 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

@@ -118,6 +118,7 @@ default['gitlab']['gitlab-rails']['geo_file_download_dispatch_worker_cron'] = ni
 default['gitlab']['gitlab-rails']['geo_repository_sync_worker_cron'] = nil
 default['gitlab']['gitlab-rails']['geo_repository_verification_primary_batch_worker_cron'] = nil
 default['gitlab']['gitlab-rails']['geo_repository_verification_secondary_scheduler_worker_cron'] = nil
+default['gitlab']['gitlab-rails']['geo_migrated_local_files_clean_up_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

@@ -270,6 +270,13 @@ production: &base
       cron: "<%= @geo_repository_verification_secondary_scheduler_worker_cron %>"
     <% end %>
+    # GitLab Geo migrated local files clean up worker
+    # NOTE: This will only take effect if Geo is enabled (secondary nodes only)
+    <% unless @geo_migrated_local_files_clean_up_worker_cron.nil? %>
+    geo_migrated_local_files_clean_up_worker:
+      cron: "<%= @geo_migrated_local_files_clean_up_worker_cron %>"
+    <% end %>
+
   #
   # 2. GitLab CI settings
   # ==========================

spec/chef/recipes/gitlab-rails_spec.rb

@@ -480,6 +480,23 @@ describe 'gitlab::gitlab-rails' do
           }
         end
       end
+
+      context 'when migrated local files cleanup worker is configured' do
+        it 'sets the cron value' do
+          stub_gitlab_rb(gitlab_rails: { geo_migrated_local_files_clean_up_worker_cron: '1 2 3 4 5' })
+
+          expect(chef_run).to render_file(gitlab_yml_path)
+            .with_content(/geo_migrated_local_files_clean_up_worker:\s+cron:\s+"1 2 3 4 5"/)
+        end
+      end
+
+      context 'when migrated local files cleanup 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_migrated_local_files_clean_up_worker')
+          }
+        end
+      end
     end
     context 'Scheduled Pipeline settings' do