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-21.1: sql,jobs: fix de-interleaving ALTER PRIMARY KEY revert, revert-failed in mixed version #71852

Merged
merged 2 commits into from Nov 1, 2021

Conversation

ajwerner
Copy link
Contributor

@ajwerner ajwerner commented Oct 21, 2021

Backport 2/3 commits from #71780.

/cc @cockroachdb/release


The first commit fixes an important, but incidentally discovered problem in jobs when in the mixed version state. The second commit refactors the code to make the fix in the third commit more obvious. The third commit fixes the bug.

sql: fix reverting de-interleaving primary key swap

We should only remove the backreference in the forward direction.

Release justification: this makes reverting ALTER PRIMARY KEY possible for interleaved tables.

Release note (bug fix): Fixed a bug which prevented rollback of ALTER PRIMARY
KEY when the old primary key was interleaved.

This commit refactors the code to remove interleaved backreferences. It also
adds a test that demonstrates that when an `ALTER PRIMARY KEY` fails and tries
to revert, that it then hits an obscure errors causing an unrecoverable failure
because the code stupidly removes a back-reference it should not remove. Fix
coming in the next commit.

Release note: None
We should only remove the backreference in the forward direction.

Release note (bug fix): Fixed a bug which prevented rollback of ALTER PRIMARY
KEY when the old primary key was interleaved.
@blathers-crl
Copy link

blathers-crl bot commented Oct 21, 2021

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

@ajwerner
Copy link
Contributor Author

ajwerner commented Nov 1, 2021

Merging so this makes the next patch release.

@ajwerner ajwerner merged commit 507abf6 into cockroachdb:release-21.1 Nov 1, 2021
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.

None yet

3 participants