Skip to content
Snippets Groups Projects
Commit a0c0fe0b authored by DJ Mountney's avatar DJ Mountney
Browse files

Merge branch 'smh-remove-read-only-mode-config' into 'master'

Remove read-only config toggle from Praefect

See merge request gitlab-org/omnibus-gitlab!4462
parents 20865cc2 6bc5f9fc
No related branches found
No related tags found
No related merge requests found
---
title: Remove read-only config toggle from Praefect
merge_request: 4462
author:
type: changed
......@@ -1945,7 +1945,6 @@
# praefect['virtual_storage_name'] = "praefect"
# praefect['failover_enabled'] = false
# praefect['failover_election_strategy'] = 'sql'
# praefect['failover_read_only_after_failover'] = true
# praefect['auth_token'] = ""
# praefect['auth_transitioning'] = false
# praefect['listen_addr'] = "localhost:2305"
......
......@@ -47,6 +47,12 @@
deprecation: '13.1',
removal: '14.0',
note: "Set gitlab_pages['env']['http_proxy'] instead. See https://docs.gitlab.com/omnibus/settings/environment-variables.html"
},
{
config_keys: %w(praefect failover_read_only_after_failover),
deprecation: '13.3',
removal: '14.0',
note: "Read-only mode is repository specific and always enabled after suspected data loss. See https://docs.gitlab.com/ee/administration/gitaly/praefect.html#read-only-mode"
}
]
......
default['praefect']['enable'] = false
default['praefect']['failover_enabled'] = false
default['praefect']['failover_election_strategy'] = 'sql'
default['praefect']['failover_read_only_after_failover'] = true
default['praefect']['failover_read_only_after_failover'] = nil
default['praefect']['auth_token'] = nil
default['praefect']['auth_transitioning'] = false
default['praefect']['dir'] = "/var/opt/gitlab/praefect"
......
......@@ -34,7 +34,6 @@
<% if @failover_election_strategy %>
election_strategy = '<%= @failover_election_strategy %>'
<% end %>
read_only_after_failover = <%= @failover_read_only_after_failover %>
[sentry]
<% if @sentry_dsn %>
......
......@@ -47,8 +47,7 @@
'sentry' => {},
'database' => {},
'failover' => { 'enabled' => false,
'election_strategy' => 'sql',
'read_only_after_failover' => true }
'election_strategy' => 'sql' }
}
expect(chef_run).to render_file(config_path).with_content { |content|
......@@ -57,7 +56,7 @@
expect(chef_run).not_to render_file(config_path)
.with_content(%r{\[prometheus\]\s+grpc_latency_buckets =})
expect(chef_run).to render_file(config_path)
.with_content(%r{\[failover\]\s+enabled = false\s+election_strategy = 'sql'\s+read_only_after_failover = true})
.with_content(%r{\[failover\]\s+enabled = false\s+election_strategy = 'sql'})
end
it 'renders the env dir files' do
......@@ -102,7 +101,6 @@
end
let(:failover_enabled) { true }
let(:failover_election_strategy) { 'local' }
let(:failover_read_only_after_failover) { true }
let(:database_host) { 'pg.internal' }
let(:database_port) { 1234 }
let(:database_user) { 'praefect-pg' }
......@@ -131,7 +129,6 @@
logging_format: log_format,
failover_enabled: failover_enabled,
failover_election_strategy: failover_election_strategy,
failover_read_only_after_failover: failover_read_only_after_failover,
virtual_storages: virtual_storages,
database_host: database_host,
database_port: database_port,
......@@ -163,9 +160,7 @@
expect(chef_run).to render_file(config_path)
.with_content("sentry_environment = '#{sentry_environment}'")
expect(chef_run).to render_file(config_path)
.with_content("read_only_after_failover = true")
expect(chef_run).to render_file(config_path)
.with_content(%r{\[failover\]\s+enabled = true\s+election_strategy = 'local'\s+read_only_after_failover = true})
.with_content(%r{\[failover\]\s+enabled = true\s+election_strategy = 'local'})
expect(chef_run).to render_file(config_path)
.with_content(%r{\[prometheus\]\s+grpc_latency_buckets = #{Regexp.escape(prometheus_grpc_latency_buckets)}})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment