Skip to content

Avoid "undefined local" error in pg-upgrade.rb#analyze_cluster

Katrin Leinweber (GTLB) requested to merge avoid-indefined-local-error into master

What does this MR do?

A new variable was accidentally introduced in 0faf786f / !4563 (merged) which expanded the existing …_cmd abbreviation, thus causing the following Ruby error if rescue Mixlib::ShellOut::CommandTimeout gets triggered:


Please re-run the command manually as the gitlab-psql user
/opt/gitlab/embedded/service/omnibus-ctl/pg-upgrade.rb:615:in `rescue in analyze_cluster': undefined local

Related issues

Checklist

See Definition of done. For anything in this list which will not be completed, please provide a reason in the MR discussion.

  1. Integration tests using GitLab QA.

As no test had been added initially, and this fix is a straight-forward typo correction in a variable name, a test now seems not needed. I confirmed in the code base that no other occurance of the incorrect name is present:

$ rg --count 'analyze_command'
files/gitlab-ctl-commands/pg-upgrade.rb:1

Required

  • MR title and description are up to date, accurate, and descriptive.
  • MR targeting the appropriate branch.
  • Latest Merge Result pipeline is green.
  • When ready for review, MR is labeled "~workflow::ready for review" per the Distribution MR workflow.

For GitLab team members

If you don't have access to this, the reviewer should trigger these jobs for you during the review process.

  • The manual Trigger:ee-package jobs have a green pipeline running against latest commit.
  • If config/software or config/patches directories are changed, make sure the build-package-on-all-os job within the Trigger:ee-package downstream pipeline succeeded.
  • If you are changing anything SSL related, then the Trigger:package:fips manual job within the Trigger:ee-package downstream pipeline must succeed.
  • If CI configuration is changed, the branch must be pushed to dev.gitlab.org to confirm regular branch builds aren't broken.

Expected (please provide an explanation if not completing)

  • Test plan indicating conditions for success has been posted and passes.
  • Documentation created/updated.
  • Tests added.
  • Integration tests added to GitLab QA.
  • Equivalent MR/issue for the GitLab Chart opened.
  • Validate potential values for new configuration settings. Formats such as integer 10, duration 10s, URI scheme://user:passwd@host:port may require quotation or other special handling when rendered in a template and written to a configuration file.
Edited by Katrin Leinweber (GTLB)

Merge request reports