Skip to content
Snippets Groups Projects

Revert migration squash that breaks 15.11

Merged Jon Jenkins requested to merge 409331-revert-squash into 15-11-stable-ee
1 unresolved thread

What does this MR do and why?

In April, I had !116021 (merged) merged, which squashed a migration that had a timestamp from January, but its corresponding commit was dated for October, which is after the squash date. This caused #409331 (closed), which prompted me to revert the squash in !118368 (merged). The revert was not present in 15.11.0 and 15.11.1, so any upgrades from 15.11.x to 16 will result in the un-squashed migrations being present for the upgrade, resulting in db:migrate attempting to re-run the init_schema migration, which naturally results in a failure.

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

  • This MR is backporting a bug fix, documentation update, or spec fix, previously merged in the default branch.
  • The original MR has been deployed to GitLab.com (not applicable for documentation or spec changes).
  • This MR has a severity label assigned (if applicable).
  • This MR has been approved by a maintainer (only one approval is required).
  • Ensure the e2e:package-and-test-ee job has either succeeded or been approved by a Software Engineer in Test.

Note to the merge request author and maintainer

The process of backporting bug fixes into stable branches is tracked as part of an internal pilot. If you have questions about this process, please:

Edited by Jon Jenkins

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
    • Resolved by Dylan Griffith

      I see lots of "allowed" failures like https://gitlab.com/gitlab-org/gitlab/-/jobs/4220691885 :

      Error: command failed: rake aborted! StandardError: An error has occurred, this and all later migrations canceled: PG::UndefinedColumn: ERROR: column "user_email_lookup_limit" of relation "application_settings" does not exist LINE 1: UPDATE "application_settings" SET user_email_lookup_limit=se...

      Is this a known issue failing elsewhere? I just want to double check since this changes a lot of migrations.

  • Jon Jenkins changed the description

    changed the description

  • Contributor

    Database migrations (on the main database)

    Migrations included in this change have been executed on gitlab.com data for testing purposes. For details, please see the migration testing pipeline (limited access).

    Migration Type Total runtime Result DB size change

    No histogram available for visualization

    Other information

    No other migrations pending on GitLab.com

    Clone details
    Clone ID Clone Created At Clone Data Timestamp Expected Removal Time
    database-testing-1913434-9961464-main 2023-05-04T19:08:31Z 2023-05-04T13:47:16Z 2023-05-05 07:12:32 +0000
    database-testing-1913434-9961464-ci 2023-05-04T19:08:31Z 2023-05-04T16:45:44Z 2023-05-05 07:12:32 +0000

    Job artifacts

    Database migrations (on the ci database)

    Migrations included in this change have been executed on gitlab.com data for testing purposes. For details, please see the migration testing pipeline (limited access).

    Migration Type Total runtime Result DB size change

    No histogram available for visualization

    Other information

    No other migrations pending on GitLab.com

    Clone details
    Clone ID Clone Created At Clone Data Timestamp Expected Removal Time
    database-testing-1913434-9961464-main 2023-05-04T19:08:31Z 2023-05-04T13:47:16Z 2023-05-05 07:12:32 +0000
    database-testing-1913434-9961464-ci 2023-05-04T19:08:31Z 2023-05-04T16:45:44Z 2023-05-05 07:12:32 +0000

    Job artifacts


    Brought to you by gitlab-org/database-team/gitlab-com-database-testing. Epic

  • Sam Kim requested review from @sabrams and removed review request for @samsam_kim

    requested review from @sabrams and removed review request for @samsam_kim

  • Sam Kim approved this merge request

    approved this merge request

    • Resolved by Dylan Griffith

      :wave: @samsam_kim, thanks for approving this merge request.

      This is the first time the merge request is approved. Please ensure the e2e:package-and-test-ee job has succeeded. If there is a failure, a Software Engineer in Test (SET) needs to confirm the failures are unrelated to the merge request. If there's no SET assigned to this team, ask for assistance on the #quality Slack channel.

  • Steve Abrams approved this merge request

    approved this merge request

  • Steve Abrams removed review request for @sabrams

    removed review request for @sabrams

  • Dylan Griffith approved this merge request

    approved this merge request

  • Dylan Griffith resolved all threads

    resolved all threads

  • Dylan Griffith enabled an automatic merge when the pipeline for 53f90aa5 succeeds

    enabled an automatic merge when the pipeline for 53f90aa5 succeeds

  • Dylan Griffith mentioned in commit 9678ef77

    mentioned in commit 9678ef77

  • merged

  • mentioned in merge request omnibus-gitlab!6850 (merged)

  • Thong Kuah changed milestone to %15.11

    changed milestone to %15.11

  • mentioned in issue #408768 (closed)

  • mentioned in issue #409331 (closed)

  • mentioned in merge request omnibus-gitlab!6856 (merged)

  • Please register or sign in to reply
    Loading