From ed312f1c12480d58e895abb85075f3e9cfe46d73 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Fri, 12 May 2017 00:05:34 -0300
Subject: [PATCH 1/3] Rename geo_backfill_worker to geo_repository_sync_worker
---
files/gitlab-config-template/gitlab.rb.template | 2 +-
files/gitlab-cookbooks/gitlab/attributes/default.rb | 2 +-
.../gitlab/templates/default/gitlab.yml.erb | 8 ++++----
spec/chef/recipes/gitlab-rails_spec.rb | 10 +++++-----
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/files/gitlab-config-template/gitlab.rb.template b/files/gitlab-config-template/gitlab.rb.template
index b9c1446045..488f551755 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 1816592c25..ef34e36766 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 764257664e..7cda2cc4f3 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 9616a97ce4..06d454d1db 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
--
GitLab
From 4ab37ae142c8751883fa8e1ac2f5e2039886685e Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Fri, 12 May 2017 00:06:07 -0300
Subject: [PATCH 2/3] Fix spec for scheduled Pipeline settings
---
spec/chef/recipes/gitlab-rails_spec.rb | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/spec/chef/recipes/gitlab-rails_spec.rb b/spec/chef/recipes/gitlab-rails_spec.rb
index 06d454d1db..a47f2f8a79 100644
--- a/spec/chef/recipes/gitlab-rails_spec.rb
+++ b/spec/chef/recipes/gitlab-rails_spec.rb
@@ -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
--
GitLab
From 9887da144a403b126e18c7544e8169f0d6a1483f Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Fri, 12 May 2017 00:24:10 -0300
Subject: [PATCH 3/3] Update CHANGELOG
---
CHANGELOG.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf7780e3e5..301e564573 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
--
GitLab