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: upgrades: batch the job_info backfill upgrade #104574

Merged
merged 1 commit into from Jun 8, 2023

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Jun 8, 2023

Backport 1/1 commits from #104545 on behalf of @dt.

/cc @cockroachdb/release


Release note (bug fix): The backfill of system.job_info upgrade migration that runs during upgrades from 22.2 now processes rows in batches to avoid cases where it could become stuck due to contention and transaction retries.
Epic: none.


Release justification: high impact bug fix that prevents stuck upgrades because of txn contention

Release note (bug fix): The backfill of system.job_info upgrade migration that runs during upgrades from 22.2 now processes rows in batches to avoid cases where it could become stuck due to contention and transaction retries.
Epic: none.
@blathers-crl blathers-crl bot requested a review from a team as a code owner June 8, 2023 06:09
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.1-104545 branch from dcffb6a to cdedbc6 Compare June 8, 2023 06:09
@blathers-crl blathers-crl bot requested a review from a team as a code owner June 8, 2023 06:09
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.1-104545 branch from 7f684f3 to 553c2e6 Compare June 8, 2023 06:09
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Jun 8, 2023
@blathers-crl
Copy link
Author

blathers-crl bot commented Jun 8, 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?

@blathers-crl blathers-crl bot assigned dt Jun 8, 2023
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Collaborator

@stevendanna stevendanna left a comment

Choose a reason for hiding this comment

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

LGTM.

For other reviewers: I believe that the batching here is correct even in the face of other writes into system.jobs because we are double-writing into both the system.jobs and job_info table at this point.

@adityamaru adityamaru merged commit ff9ee56 into release-23.1 Jun 8, 2023
6 checks passed
@adityamaru adityamaru deleted the blathers/backport-release-23.1-104545 branch June 8, 2023 12:34
@dt
Copy link
Member

dt commented Jun 8, 2023

batching here is correct even in the face of other writes into system.jobs

I'm not sure I appreciate how the dual-writes interacts with batching or not batching ?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants