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.

Sign up for GitHub

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

Jump to bottom

release-23.1: backupccl: add missing ctx cancel check #111245

Closed
wants to merge 1 commit into from
Closed

release-23.1: backupccl: add missing ctx cancel check #111245

wants to merge 1 commit into from

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Sep 25, 2023 •
edited by stevendanna
Loading

Backport 1/1 commits from #111231 on behalf of @adityamaru.

/cc @cockroachdb/release

In #111159 we deduced from the stacks a
situation in which the goroutine draining spanCh had exited due to a context cancelation but the
writer was not listening for a ctx cancelation.
This manifests as a stuck restore when using
the non-default make simple import spans implementation.

Fixes: #111159
Release note: None

Release justification: bug fix that could cause the restore to hang on shutdown

@adityamaru
backupccl: add missing ctx cancel check
57cec5c 
In #111159 we deduced from the stacks a
situation in which the goroutine draining `spanCh`
had exited due to a context cancelation but the
writer was not listening for a ctx cancelation.
This manifests as a stuck restore when using
the non-default make simple import spans implementation.

Fixes: #111159
Release note: None
@blathers-crl blathers-crl bot requested a review from a team as a code owner September 25, 2023 23:16
@blathers-crl blathers-crl bot requested review from lidorcarmel and removed request for a team September 25, 2023 23:16
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.1-111231 branch from b08ec85 to 9ff8467 Compare September 25, 2023 23:16
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Sep 25, 2023
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.1-111231 branch from c80b3fd to 57cec5c Compare September 25, 2023 23:16
@blathers-crl
Copy link
Author

blathers-crl bot commented Sep 25, 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 added the backport Label PR's that are backports to older release branches label Sep 25, 2023
@blathers-crl
Copy link
Author

blathers-crl bot commented Sep 25, 2023

It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR?

🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@github-actions
Copy link

Reminder: it has been 3 weeks please merge or close your backport!

@yuzefovich
Copy link
Member

Friendly ping: @msbutler is this something we want to merge?

@msbutler msbutler assigned msbutler and unassigned adityamaru Jan 22, 2024
@msbutler msbutler mentioned this pull request Feb 9, 2024
Merged
@msbutler msbutler closed this Feb 9, 2024
@rafiss rafiss deleted the blathers/backport-release-23.1-111231 branch March 27, 2024 16:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@msbutler msbutler msbutler approved these changes

@lidorcarmel lidorcarmel Awaiting requested review from lidorcarmel lidorcarmel is a code owner automatically assigned from cockroachdb/disaster-recovery

@rhu713 rhu713 Awaiting requested review from rhu713

Assignees

@msbutler msbutler

Labels
backport Label PR's that are backports to older release branches blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@cockroach-teamcity @yuzefovich @msbutler @adityamaru