Merge branch 'sh-geo-increase-wal-segments' into 'master'

Increase wal_keep_segments setting from 10 to 50 for Geo primary

Closes gitlab-ee#3463

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

CHANGELOG.md

@@ -9,6 +9,7 @@ omnibus-gitlab repository.
 - Remove unused Grit configuration settings
 - Add concurrency configuration for Gitaly
 - Enable profiler for jemalloc
+- Increase wal_keep_segments setting from 10 to 50 for Geo primary
 - Disable NGINX buffering with container registry
 - Add -artifacts-server and -artifacts-server-timeout support to Omnibus
 - Added PostgreSQL support for effective_io_concurrency

files/gitlab-cookbooks/package/libraries/config/roles/geo_primary.rb

@@ -22,7 +22,7 @@ module GeoPrimaryRole
     Gitlab['postgresql']['sql_replication_user'] ||= 'gitlab_replicator'
     Gitlab['postgresql']['wal_level'] = 'hot_standby'
     Gitlab['postgresql']['max_wal_senders'] ||= 10
-    Gitlab['postgresql']['wal_keep_segments'] ||= 10
+    Gitlab['postgresql']['wal_keep_segments'] ||= 50
     Gitlab['postgresql']['max_replication_slots'] ||= 1
     Gitlab['postgresql']['hot_standby'] = 'on'
   end

spec/chef/gitlab-ee/libraries/gitlab_geo_spec.rb

@@ -49,7 +49,7 @@ describe GitlabGeo do
       end
 
       it 'defines wal_keep_segments' do
-        expect(config_attrs['wal_keep_segments']).to eq(10)
+        expect(config_attrs['wal_keep_segments']).to eq(50)
       end
 
       it 'defines max_replication_slots' do