release-21.1: sql,jobs: fix de-interleaving ALTER PRIMARY KEY revert, revert-failed in mixed version #71852
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.