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.2: backup: use correct Context in restore workers #76509

Merged
merged 1 commit into from
Feb 18, 2022
Merged

release-21.2: backup: use correct Context in restore workers #76509

merged 1 commit into from
Feb 18, 2022

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Feb 14, 2022

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

/cc @cockroachdb/release


Previously some of the workers, which are called by ctxgroup goroutines,
were using RestoreDataProcessor.Ctx, instead of the child context that
the group created, which, critically, is cancelled if any group task
fails. This could mean one worker in the group fails and stops draining
a channel and returns an error to the group, which cancels its context,
but another worker trying to write to that channel hangs if it is not
checking the passed, now cancelled context.

Release note (bug fix): fix a case where a RESTORE job could hang if it encountered an error when ingesting restored data.


Release justification: bug fix.

Previously some of the workers, which are called by ctxgroup goroutines,
were using RestoreDataProcessor.Ctx, instead of the child context that
the group created, which, critically, is cancelled if any group task
fails. This could mean one worker in the group fails and stops draining
a channel and returns an error to the group, which cancels its context,
but another worker trying to write to that channel hangs if it is not
checking the passed, now cancelled context.

Release note (bug fix): fix a case where a RESTORE job could hang if it encountered an error when ingesting restored data.
@blathers-crl blathers-crl bot requested review from a team and dt and removed request for a team February 14, 2022 15:21
@blathers-crl
Copy link
Author

blathers-crl bot commented Feb 14, 2022

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 requested a review from adityamaru February 14, 2022 15:21
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Feb 14, 2022
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@dt
Copy link
Member

dt commented Feb 14, 2022

Do we think we should backport this? I was mostly just testing a blathers change and needed a tiny clean patch to test.... but I suppose it is bug to fix?

@dt dt merged commit 6133ffd into cockroachdb:release-21.2 Feb 18, 2022
@dt dt deleted the blathers/backport-release-21.2-74905 branch February 18, 2022 04:33
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.

3 participants