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: schemachanger,scbuild: fix assertion bug #106286

Merged
merged 1 commit into from
Jul 6, 2023

Conversation

postamar
Copy link

@postamar postamar commented Jul 6, 2023

Backport 1 commit from #106175.

/cc @cockroachdb/release

Release justification: important bug fix


The declarative schema changer builder contains assertions on the state of elements and their targets and these could sometimes fail because the check which verifies that the corresponding descriptors are not already undergoing a schema change was performed later. This commit fixes this by moving the check earlier so the assertion is never reached in those cases.

This commit removes a skipped test which is superseded by a new test in the schemachanger package.

Fixes: #45510
Fixes: #102927
Fixes: #105754

Release note (bug fix): fixed a bug which manifested itself in error messages containing "failed to drop all of the relevant elements" when executing DDL statements with the declarative schema changer. What this really means is that there's a concurrent schema change that's ongoing. Instead we now behave as expected and wait for it to finish.

@blathers-crl
Copy link

blathers-crl bot commented Jul 6, 2023

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Patches should only be created for serious issues or test-only changes.
  • Patches should not break backwards-compatibility.
  • Patches should change as little code as possible.
  • Patches should not change on-disk formats or node communication protocols.
  • Patches should not add new functionality.
  • Patches must not add, edit, or otherwise modify cluster versions; or add version gates.
If some of the basic criteria cannot be satisfied, ensure that the exceptional criteria are satisfied within.
  • 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.
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.

Add a brief release justification to the body of your PR to justify this backport.

Some other things to consider:

  • What did we do to ensure that a user that doesn’t know & care about this backport, has no idea that it happened?
  • Will this work in a cluster of mixed patch versions? Did we test that?
  • If a user upgrades a patch version, uses this feature, and then downgrades, what happens?

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@postamar postamar force-pushed the backport-fix-45510 branch from e1787e0 to 6123eda Compare July 6, 2023 14:31
The declarative schema changer builder contains assertions on the state
of elements and their targets and these could sometimes fail because the
check which verifies that the corresponding descriptors are not already
undergoing a schema change was performed later. This commit fixes this
by moving the check earlier so the assertion is never reached in those
cases.

This commit removes a skipped test which is superseded by a new test in
the schemachanger package.

Fixes: cockroachdb#45510
Fixes: cockroachdb#102927
Fixes: cockroachdb#105754

Release note (bug fix): fixed a bug which manifested itself in error
messages containing "failed to drop all of the relevant elements" when
executing DDL statements with the declarative schema changer. What this
really means is that there's a concurrent schema change that's ongoing.
Instead we now behave as expected and wait for it to finish.
@postamar postamar force-pushed the backport-fix-45510 branch from 6123eda to db4e103 Compare July 6, 2023 15:55
@postamar postamar marked this pull request as ready for review July 6, 2023 16:37
@postamar postamar requested a review from a team as a code owner July 6, 2023 16:37
@postamar postamar merged commit f15468f into cockroachdb:release-23.1 Jul 6, 2023
@postamar postamar deleted the backport-fix-45510 branch July 6, 2023 16:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants