Merge branch 'hot-standby-feedback'

CHANGELOG.md

@@ -7,6 +7,10 @@ omnibus-gitlab repository.
 
 - Remove deprecated satellites configuration
 
+9.0.3
+
+- Added support for managing PostgreSQL's hot_standby_feedback option
+
 9.0.2
 
 - No changes

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

@@ -632,6 +632,7 @@ external_url 'GENERATED_EXTERNAL_URL'
 # postgresql['max_replication_slots'] = 0
 # postgresql['synchronous_commit'] = on
 # postgresql['synchronous_standby_names'] = ''
+# postgresql['hot_standby_feedback' = 'off'
 
 # Backup/Archive settings
 # default['gitlab']['postgresql']['archive_mode'] = "off"

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

@@ -411,6 +411,7 @@ default['gitlab']['postgresql']['max_standby_streaming_delay'] = "30s"
 default['gitlab']['postgresql']['max_replication_slots'] = 0
 default['gitlab']['postgresql']['synchronous_commit'] = 'on'
 default['gitlab']['postgresql']['synchronous_standby_names'] = ''
+default['gitlab']['postgresql']['hot_standby_feedback'] = 'off'
 
 # Backup/Archive settings
 default['gitlab']['postgresql']['archive_mode'] = "off"

files/gitlab-cookbooks/gitlab/templates/default/postgresql.conf.erb

@@ -239,7 +239,7 @@ max_standby_streaming_delay = <%= @max_standby_streaming_delay %> # max delay be
           # -1 allows indefinite delay
 #wal_receiver_status_interval = 10s # send replies at least this often
           # 0 disables
-#hot_standby_feedback = off   # send info from standby to prevent
+hot_standby_feedback = <%= @hot_standby_feedback %>   # send info from standby to prevent
           # query conflicts
 
 

spec/chef/recipes/postgresql_spec.rb

@@ -233,6 +233,15 @@ describe 'postgresql 9.6' do
       ).with_content(/^dynamic_shared_memory_type = /)
     end
 
+    it 'sets the hot_standby_feedback setting' do
+      expect(chef_run.node['gitlab']['postgresql']['hot_standby_feedback'])
+        .to eq('off')
+
+      expect(chef_run).to render_file(
+        '/var/opt/gitlab/postgresql/data/postgresql.conf'
+      ).with_content(/hot_standby_feedback = off/)
+    end
+
     context 'when dynamic_shared_memory_type is none' do
       before do
         stub_gitlab_rb({