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

backupccl: add missing ctx cancel check #111231

Merged
merged 1 commit into from
Sep 25, 2023

Conversation

adityamaru
Copy link
Contributor

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

In cockroachdb#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: cockroachdb#111159
Release note: None
@adityamaru adityamaru requested a review from a team as a code owner September 25, 2023 19:33
@blathers-crl
Copy link

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

Copy link
Collaborator

@msbutler msbutler left a comment

Choose a reason for hiding this comment

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

This is, in theory, unit test able. but this is also dead, non default code. And we have bigger things on our plate.

@adityamaru
Copy link
Contributor Author

This is, in theory, unit test able. but this is also dead, non default code. And we have bigger things on our plate.

the exact thought that went through my head. If it makes sense to you/rui I think I feel pretty good just merging it for now.

@adityamaru
Copy link
Contributor Author

TFTR!

bors r=msbutler

@adityamaru adityamaru added backport-22.2.x backport-23.1.x Flags PRs that need to be backported to 23.1 labels Sep 25, 2023
@craig
Copy link
Contributor

craig bot commented Sep 25, 2023

Build succeeded:

@craig craig bot merged commit 46cb4e3 into cockroachdb:master Sep 25, 2023
8 checks passed
@blathers-crl
Copy link

blathers-crl bot commented Sep 25, 2023

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from 6fabaf8 to blathers/backport-release-22.2-111231: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 22.2.x failed. See errors above.


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

@adityamaru adityamaru deleted the missing-ctx-check branch September 26, 2023 14:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-23.1.x Flags PRs that need to be backported to 23.1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

roachtest: restore/tpce/400GB/aws/nodes=8/cpus=8 failed
3 participants