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-23.1: sql: only validate new regions when adding/dropping #114197

Merged
merged 1 commit into from
Nov 17, 2023

Conversation

rafiss
Copy link
Collaborator

@rafiss rafiss commented Nov 9, 2023

Backport 1/1 commits from #113956.

/cc @cockroachdb/release

Release justification: low risk fix for a serious bug


When we added validation logic to make sure every region corresponded to a known node locality, we were a little too aggressive. The validation made it possible to end up in a state where any ALTER..REGION operation could hang. This could happen in a few situations; for example:

  • node is restarted with a different locality flag.
  • MR cluster is restored into a non-MR cluster.
  • c2c streaming is used with a MR source and non-MR destination.

In all these cases, the problem was that the zone configuration could reference a region that no longer has any nodes with the corresponding locality. The validation was too aggressive, since it would validate those regions which already existed in the zone configuration.

Now, only the newly added region is validated.

fixes #113324
fixes #113871

Release note (bug fix): Fixed a bug that could cause ALTER DATABASE ... ADD/DROP REGION to hang if node localities were changed after regions were added.

@rafiss rafiss requested review from fqazi and Xiang-Gu November 9, 2023 22:33
@rafiss rafiss requested review from a team as code owners November 9, 2023 22:33
@rafiss rafiss requested review from herkolategan and srosenberg and removed request for a team November 9, 2023 22:33
Copy link

blathers-crl bot commented Nov 9, 2023

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 and one additional
    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 9, 2023
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@rafiss
Copy link
Collaborator Author

rafiss commented Nov 13, 2023

let's wait for #113301 to be backported before merging this.

Copy link
Contributor

@chrisseto chrisseto left a comment

Choose a reason for hiding this comment

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

:lgtm: and it looks like the linked PR has been backported!

When we added validation logic to make sure every region corresponded to
a known node locality, we were a little too aggressive. The validation
made it possible to end up in a state where any ALTER..REGION operation
could hang. This could happen in a few situations; for example:

- node is restarted with a different locality flag.
- MR cluster is restored into a non-MR cluster.
- c2c streaming is used with a MR source and non-MR destination.

In all these cases, the problem was that the zone configuration could
reference a region that no longer has any nodes with the corresponding
locality. The validation was too aggressive, since it would validate
those regions which already existed in the zone configuration.

Now, only the newly added region is validated.

Release note (bug fix): Fixed a bug that could cause ALTER DATABASE ...
ADD/DROP REGION to hang if node localities were changed after regions
were added.
@rafiss rafiss force-pushed the backport23.1-113956 branch from 96808ef to 6d740e0 Compare November 16, 2023 22:08
@rafiss rafiss merged commit 85392ec into cockroachdb:release-23.1 Nov 17, 2023
6 checks passed
@rafiss rafiss deleted the backport23.1-113956 branch November 17, 2023 03:04
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