Merge branch 'add-postgres-14' into 'master'

Add PostgreSQL 14 builds

Closes #7702

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/6811

Merged-by: Balasankar 'Balu' C <[email protected]>
Approved-by: Clemens Beck <[email protected]>
Approved-by: Balasankar 'Balu' C <[email protected]>
Reviewed-by: Clemens Beck <[email protected]>
Co-authored-by: dustinmm80 <[email protected]>

Author: balasankarc

config/software/postgresql.rb

@@ -35,7 +35,6 @@
 end
 
 major_version = '13'
-libpq = 'libpq.so.5'
 
 source url: "https://ftp.postgresql.org/pub/source/v#{version}/postgresql-#{version}.tar.bz2"
 
@@ -60,8 +59,6 @@
   make "world -j #{workers}", env: env
   make 'install-world', env: env
 
-  link "#{prefix}/lib/#{libpq}", "#{install_dir}/embedded/lib/#{libpq}"
-
   # NOTE: There are several dependencies which require these files in these
   # locations and have dependency on `postgresql_new`. So when this block is
   # changed to be in the `postgresql` software definition for default PG

config/software/postgresql_new.rb

@@ -0,0 +1,70 @@
+#
+# Copyright 2012-2014 Chef Software, Inc.
+# Copyright:: Copyright (c) 2016 GitLab Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+name 'postgresql_new'
+default_version '14.8'
+
+license 'PostgreSQL'
+license_file 'COPYRIGHT'
+
+skip_transitive_dependency_licensing true
+
+dependency 'zlib'
+dependency 'openssl' unless Build::Check.use_system_ssl?
+dependency 'libedit'
+dependency 'ncurses'
+dependency 'libossp-uuid'
+dependency 'config_guess'
+
+version '14.8' do
+  source sha256: '39d38f0030737ed03835debeefee3b37d335462ce4995e2497bc38d621ebe45a'
+end
+
+major_version = '14'
+libpq = 'libpq.so.5'
+
+source url: "https://ftp.postgresql.org/pub/source/v#{version}/postgresql-#{version}.tar.bz2"
+
+relative_path "postgresql-#{version}"
+
+build do
+  env = with_standard_compiler_flags(with_embedded_path)
+
+  env['CFLAGS'] << ' -fno-omit-frame-pointer'
+
+  prefix = "#{install_dir}/embedded/postgresql/#{major_version}"
+  update_config_guess(target: 'config')
+
+  patch source: 'no_docs.patch', target: 'GNUmakefile.in'
+
+  command './configure' \
+          " --prefix=#{prefix}" \
+          ' --with-libedit-preferred' \
+          ' --with-openssl' \
+          ' --with-uuid=ossp', env: env
+
+  make "world -j #{workers}", env: env
+  make 'install-world', env: env
+
+  link "#{prefix}/lib/#{libpq}", "#{install_dir}/embedded/lib/#{libpq}"
+end
+
+# exclude headers and static libraries from package
+project.exclude "embedded/postgresql/#{major_version}/include"
+project.exclude "embedded/postgresql/#{major_version}/lib/*.a"
+project.exclude "embedded/postgresql/#{major_version}/lib/pgxs"
+project.exclude "embedded/postgresql/#{major_version}/lib/pkgconfig"

config/software/psycopg2.rb

@@ -27,9 +27,9 @@
 source git: version.remote
 
 dependency 'python3'
-dependency 'postgresql'
+dependency 'postgresql_new'
 
-pg_major_version = '13'
+pg_major_version = '14'
 
 build do
   env = with_standard_compiler_flags(with_embedded_path)

doc/settings/database.md

@@ -535,6 +535,19 @@ To opt out of automatic PostgreSQL upgrades during GitLab package upgrades, run:
 sudo touch /etc/gitlab/disable-postgresql-upgrade
 ```
 
+#### GitLab 16.2 and later
+
+As of GitLab 16.2, PostgreSQL 13.11 and 14.8 are both shipped with Omnibus.
+During a package upgrade, the database isn't upgraded to PostgreSQL 14. If you
+want to upgrade to PostgreSQL 14, you must do it manually:
+
+```shell
+sudo gitlab-ctl pg-upgrade -V 14
+```
+
+PostgreSQL 14 isn't supported on Geo deployments and is [planned](https://gitlab.com/groups/gitlab-org/-/epics/9065)
+for future releases.
+
 #### GitLab 16.0 and later
 
 PostgreSQL version 12 is no longer supported and the binaries have been

docker/assets/wrapper

@@ -189,7 +189,7 @@ fi
 
 # This must be false when the opt-in PostgreSQL version is the default for pg-upgrade,
 # otherwise it must be true.
-ATTEMPT_AUTO_PG_UPGRADE='true'
+ATTEMPT_AUTO_PG_UPGRADE='false'
 
 # Make sure PostgreSQL is at the latest version.
 # If it fails, print a message with a workaround and exit

files/gitlab-ctl-commands/pg-upgrade.rb

@@ -744,7 +744,7 @@ def old_version
 end
 
 def default_version
-  PGVersion.parse(version_from_manifest('postgresql_new')) || PGVersion.parse(version_from_manifest('postgresql'))
+  PGVersion.parse(version_from_manifest('postgresql'))
 end
 
 def new_version

files/gitlab-ctl-commands/upgrade.rb

@@ -344,7 +344,7 @@ def patroni_detected?
 def attempt_auto_pg_upgrade?
   # This must return false when the opt-in PostgreSQL version is the default for pg-upgrade,
   # otherwise it must be true.
-  true
+  false
 end
 
 def recommend_pg_upgrade?

spec/chef/cookbooks/postgresql/recipes/postgresql_spec.rb

@@ -612,6 +612,24 @@
   end
 end
 
+RSpec.describe 'postgresql 14' do
+  let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(runit_service postgresql_config)).converge('gitlab::default') }
+  let(:postgresql_conf) { File.join(postgresql_data_dir, 'postgresql.conf') }
+  let(:runtime_conf) { '/var/opt/gitlab/postgresql/data/runtime.conf' }
+
+  before do
+    allow_any_instance_of(PgHelper).to receive(:version).and_return(PGVersion.new('14.0'))
+    allow_any_instance_of(PgHelper).to receive(:database_version).and_return(PGVersion.new('14.0'))
+  end
+
+  it 'configures wal_keep_size instead of wal_keep_segments' do
+    expect(chef_run).to render_file(runtime_conf).with_content { |content|
+      expect(content).to include("wal_keep_size")
+      expect(content).not_to include("wal_keep_segments")
+    }
+  end
+end
+
 RSpec.describe 'postgresql 13' do
   let(:chef_run) { ChefSpec::SoloRunner.new(step_into: %w(runit_service postgresql_config)).converge('gitlab::default') }
   let(:postgresql_conf) { File.join(postgresql_data_dir, 'postgresql.conf') }