Skip to content

Revert "Merge branch 'jliu/deprecate-git-data-dirs-path' into 'master'"

John Skarbek requested to merge revert-382e882e into master

What does this MR do?

This reverts: !7962 (merged)

Current Staging Canary for .com is tossing an error:

System Info:
------------
chef_version=18.3.0
platform=ubuntu
platform_version=20.04
ruby=ruby 3.2.5 (2024-07-26 revision 31d0f1a2e7) [x86_64-linux]
program_name=/opt/gitlab/embedded/bin/cinc-client
executable=/opt/gitlab/embedded/bin/cinc-client


Running handlers:
[2024-12-31T17:24:03+00:00] ERROR: Running exception handlers
There was an error running gitlab-ctl reconfigure:

Multiple Gitaly storages are sharing the same filesystem path:
  /var/opt/gitlab/git-data/repositories: default, gitaly-cny-01-stor-gstg.c.gitlab-staging-1.internal

Running handlers complete
[2024-12-31T17:24:03+00:00] ERROR: Exception handlers complete
Infra Phase failed. 0 resources updated in 03 seconds
[2024-12-31T17:24:03+00:00] FATAL: Stacktrace dumped to /opt/gitlab/embedded/cookbooks/cache/cinc-stacktrace.out
[2024-12-31T17:24:03+00:00] FATAL: ---------------------------------------------------------------------------------------
[2024-12-31T17:24:03+00:00] FATAL: PLEASE PROVIDE THE CONTENTS OF THE stacktrace.out FILE (above) IF YOU FILE A BUG REPORT
[2024-12-31T17:24:03+00:00] FATAL: ---------------------------------------------------------------------------------------
[2024-12-31T17:24:03+00:00] FATAL: RuntimeError: Multiple Gitaly storages are sharing the same filesystem path:
  /var/opt/gitlab/git-data/repositories: default, gitaly-cny-01-stor-gstg.c.gitlab-staging-1.internal

This blocks Auto-Deployments until the problem is resolved. Since it's noted in the description that this is a deprecation in version 18.0, we shouldn't be suffering this breakage at the moment, so I suspect we have an incorrectly operating check here.

We should work to mitigate .com prior to this change having been merged otherwise deployments will not succeed on .com. This is considered a high risk problem as auto-deployments prevent other code changes from landing.

Revert "Merge branch 'jliu/deprecate-git-data-dirs-path' into 'master'"

This reverts merge request !7962 (merged)

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.

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 workflowready 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.

Merge request reports