gitlab
/
omnibus-gitlab
mirror of https://gitlab.com/gitlab-org/omnibus-gitlab.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sh-fix-missing-log-arguments' into 'master' 

Fix missing arguments when PostgreSQL upgrade times out

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

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: Stan Hu <stanhu@gmail.com>
This commit is contained in:
Balasankar 'Balu' C 2024-04-20 06:45:57 +00:00
parent 4334402cad 39fa902e77
commit e8cecdcf2e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/gitlab-ctl-commands/lib/gitlab_ctl/pg_upgrade.rb
View File

@ -157,7 +157,7 @@ module GitlabCtl
log "STDERR: #{e.stderr}"
false
rescue Mixlib::ShellOut::CommandTimeout
log
log ""
log "Timed out during the database upgrade.".color(:red)
log "To run with more time, remove the temporary directory #{tmp_data_dir}.#{target_version.major},".color(:red)
log "then re-run your previous command, adding the --timeout option.".color(:red)