Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release-24.1: upgrades: fix destructive upgrade bug that was introduced when permanent upgrades were flattened #136074

Open
wants to merge 2 commits into
base: release-24.1
Choose a base branch
from

Conversation

rafiss
Copy link
Collaborator

@rafiss rafiss commented Nov 23, 2024

fixes #133519
Release justification: fixes a major bug


roachtest: add test to verify that permanent upgrades are not re-executed

This test shows that there is a bug in how permanent upgrades are
applied when upgrading from clusters that started on a version older
than v23.1.

Release note: None


Revert "upgrades: remove v22_2 compatibility"

This partially reverts commit 129d62a.

It also fixes the roachtest that was added in the previous commit.

In PR #119142, the permanent upgrades were flattened so that they
all have a version of 0.0-x. That means that the last element of
the permanentUpgrades slice has a version of 0.0-4. Clusters that were
bootstrapped with a version from v23.1.0 or later will have rows in
system.migrations for versions 0.0-x, since that is the version where
the permanent upgrades framework was introduced (in PR #119142).
However, clusters that were bootstrapped from a version
earlier than v23.1 will not yet have these rows in system.migrations for
versions 0.0-x, and those migrations will only be present under the
legacy startupmigrations key.

Release note (bug fix): Fixed a bug that could cause the password for
the root user to be deleted while upgrading to v24.1. This bug only
affects clusters that were initially created with a version of v22.2
or earlier.

The same bug could also cause the defaultdb and postgres databases
to be recreated during the upgrade to v24.1 if they had been previously
deleted.

@rafiss rafiss requested a review from a team as a code owner November 23, 2024 19:48
@rafiss rafiss requested review from nameisbhaskar and vidit-bhat and removed request for a team November 23, 2024 19:48
Copy link

blathers-crl bot commented Nov 23, 2024

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Backports should only be created for serious
    issues
    or test-only changes.
  • Backports should not break backwards-compatibility.
  • Backports should change as little code as possible.
  • Backports should not change on-disk formats or node communication protocols.
  • Backports should not add new functionality (except as defined
    here).
  • Backports must not add, edit, or otherwise modify cluster versions; or add version gates.
  • All backports must be reviewed by the owning areas TL. For more information as to how that review should be conducted, please consult the backport
    policy
    .
If your backport adds new functionality, please ensure that the following additional criteria are satisfied:
  • There is a high priority need for the functionality that cannot wait until the next release and is difficult to address in another way.
  • The new functionality is additive-only and only runs for clusters which have specifically “opted in” to it (e.g. by a cluster setting).
  • New code is protected by a conditional check that is trivial to verify and ensures that it only runs for opt-in clusters. State changes must be further protected such that nodes running old binaries will not be negatively impacted by the new state (with a mixed version test added).
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.
  • Your backport must be accompanied by a post to the appropriate Slack
    channel (#db-backports-point-releases or #db-backports-XX-X-release) for awareness and discussion.

Also, please add a brief release justification to the body of your PR to justify this
backport.

@blathers-crl blathers-crl bot added the backport Label PR's that are backports to older release branches label Nov 23, 2024
@cockroach-teamcity
Copy link
Member

This change is Reviewable

…uted

This test shows that there is a bug in how permanent upgrades are
applied when upgrading from clusters that started on a version older
than v23.1.

Release note: None
This partially reverts commit 129d62a.

It also fixes the roachtest that was added in the previous commit.

In PR cockroachdb#119142, the permanent upgrades were flattened so that they
all have a version of 0.0-x. That means that the last element of
the permanentUpgrades slice has a version of 0.0-4. Clusters that were
bootstrapped with a version from v23.1.0 or later will have rows in
system.migrations for versions 0.0-x, since that is the version where
the permanent upgrades framework was introduced (in PR cockroachdb#119142).
However, clusters that are were bootstrapped from a version
earlier than v23.1 will not yet have these rows in system.migrations for
versions 0.0-x, and those migrations will only be present under the
legacy startupmigrations key.

Release note (bug fix): Fixed a bug that could cause the password for
the root user to be deleted while upgrading to v24.1. This bug only
affects clusters that were initially created with a version of v22.2
or earlier.

The same bug could also cause the `defaultdb` and `postgres` databases
to be recreated during the upgrade to v24.1 if they had been previously
deleted.
@rafiss rafiss force-pushed the fix-flattened-permanent-upgrades branch from 590ee4d to e8e49c7 Compare November 23, 2024 19:56
mvt := mixedversion.NewTest(
ctx, t, t.L(), c, c.All(),
// We want to start from v22.1 or earlier.
mixedversion.MinUpgrades(4),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if should add mixedversion.MustUpgrades(x, y) (to the framework) since MinUpgrades will rot over time, i.e., as of v25.2.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Label PR's that are backports to older release branches
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants