diff --git a/files/gitlab-ctl-commands/pg-upgrade.rb b/files/gitlab-ctl-commands/pg-upgrade.rb index 0d08132eef2fed5347773a8070e3c90b3b4b0d2e_ZmlsZXMvZ2l0bGFiLWN0bC1jb21tYW5kcy9wZy11cGdyYWRlLnJi..b0a88298538a3c48d647ca87b5b8e10c19ba3fb1_ZmlsZXMvZ2l0bGFiLWN0bC1jb21tYW5kcy9wZy11cGdyYWRlLnJi 100644 --- a/files/gitlab-ctl-commands/pg-upgrade.rb +++ b/files/gitlab-ctl-commands/pg-upgrade.rb @@ -173,11 +173,10 @@ Kernel.exit 0 end - log 'Checking for a newer version of PostgreSQL to install' - if @db_worker.target_version && Dir.exist?("#{INST_DIR}/#{@db_worker.target_version.major}") - log "Upgrading PostgreSQL to #{@db_worker.target_version}" - else + unless GitlabCtl::Util.progress_message('Checking for a newer version of PostgreSQL to install') do + @db_worker.target_version && Dir.exist?("#{INST_DIR}/#{@db_worker.target_version.major}") + end $stderr.puts 'No new version of PostgreSQL installed, nothing to upgrade to' Kernel.exit 0 end @@ -180,7 +179,9 @@ $stderr.puts 'No new version of PostgreSQL installed, nothing to upgrade to' Kernel.exit 0 end + log "Upgrading PostgreSQL to #{@db_worker.target_version}" + deprecation_message if @db_worker.target_version.major.to_f < 13 target_data_dir = "#{@db_worker.tmp_data_dir}.#{@db_worker.target_version.major}"