gitlab
/
omnibus-gitlab
mirror of https://gitlab.com/gitlab-org/omnibus-gitlab.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove circuitbreaker settings from Omnibus

This commit is contained in:
Bob Van Landuyt 2017-10-20 16:27:36 +03:00
parent 24ee8b0302
commit 83ad75c0ec
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
files/gitlab-config-template/gitlab.rb.template
View File

@ -312,11 +312,7 @@ external_url 'GENERATED_EXTERNAL_URL'
###! path that doesn't contain symlinks.**
# git_data_dirs({
# "default" => {
# "path" => "/mnt/nfs-01/git-data",
# "failure_count_threshold" => 10,
# "failure_wait_time" => 30,
# "failure_reset_time" => 1800,
# "storage_timeout" => 30
# "path" => "/mnt/nfs-01/git-data"
# }
# })

6
files/gitlab-cookbooks/gitlab/libraries/gitlab_rails.rb
View File

@ -143,11 +143,7 @@ module GitlabRails
Gitlab['gitlab_rails']['repositories_storages'] ||= {
"default" => {
"path" => "/var/opt/gitlab/git-data/repositories",
"gitaly_address" => gitaly_address,
"failure_count_threshold" => 10,
"failure_wait_time" => 30,
"failure_reset_time" => 1800,
"storage_timeout" => 30
"gitaly_address" => gitaly_address
}
}
end

6
spec/chef/recipes/gitlab-rails_spec.rb
View File

@ -195,18 +195,16 @@ describe 'gitlab::gitlab-rails' do
stub_gitlab_rb(
git_data_dirs: {
"second_storage" => {
"path" => "tmp/storage",
"failure_count_threshold" => 15,
"path" => "tmp/storage"
}
}
)
expect(chef_run).to render_file(gitlab_yml_path).with_content('"path":"tmp/storage/repositories"')
expect(chef_run).to render_file(gitlab_yml_path).with_content('"failure_count_threshold":15')
end
it 'sets the defaults' do
default_json = '{"default":{"path":"/var/opt/gitlab/git-data/repositories","gitaly_address":"unix:/var/opt/gitlab/gitaly/gitaly.socket","failure_count_threshold":10,"failure_wait_time":30,"failure_reset_time":1800,"storage_timeout":30}}'
default_json = '{"default":{"path":"/var/opt/gitlab/git-data/repositories","gitaly_address":"unix:/var/opt/gitlab/gitaly/gitaly.socket"}}'
expect(chef_run).to render_file(gitlab_yml_path).with_content(default_json)
end
end