Skip to content
Snippets Groups Projects
Commit b0a88298538a authored by Robert Marshall's avatar Robert Marshall
Browse files

Use progress message on newer PG version check

- When `pg-upgrade` checks if a newer version of PostgreSQL is available
  to use, use the progress_message feature to align with all the other
  checks performed.

Related https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8247
parent 0d08132eef2f
No related branches found
No related tags found
2 merge requests!130Merge upstream Omnibus GitLab into Omnibus Heptapod,!129Merge upstream Omnibus GitLab into Omnibus Heptapod
......@@ -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}"
......
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