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: stop blocking backup/restore jobs on client disconnect #51999

Merged
merged 2 commits into from
Jul 28, 2020

Conversation

pbardea
Copy link
Contributor

@pbardea pbardea commented Jul 28, 2020

Previously, a backup/restore job whose client disconnect might have blocked on
sending its results to the resultCh (and thus block forever). This
commit allows these jobs to complete.

Release note (bug fix): Previously, a BACKUP/RESTORE jobs would
sometimes block once it finished executing the job. This is now fixed.

@pbardea pbardea requested review from dt and a team July 28, 2020 14:51
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Member

@dt dt left a comment

Choose a reason for hiding this comment

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

Reviewed 2 of 2 files at r1.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained

@dt
Copy link
Member

dt commented Jul 28, 2020

do we need to do RESTORE too?

@pbardea
Copy link
Contributor Author

pbardea commented Jul 28, 2020

Yep, was going to follow up in a separate PR - but I may as well as bundle it with this one. Will push the changes here.

@pbardea
Copy link
Contributor Author

pbardea commented Jul 28, 2020

Updated with RESTORE, RFAL.

Previously, a backup job whose client disconnect might have blocked on
sending its results to the resultCh (and thus block forever). This
commit allows these jobs to complete.

Release note (bug fix): Previously, a BACKUP job would block once it
finished backing up the data.
This commit prevents RESTORE from blocking when sending its results back
over resultCh if the client that started the job disconnects.

Release note (bug fix): Previously, RESTORE would sometimes block at the
end of the job when sending its results back if the connection that
started the job disconnected. This is now fixed.
@pbardea pbardea changed the title backupccl: stop blocking backup jobs on client disconnect backupccl: stop blocking backup/restore jobs on client disconnect Jul 28, 2020
@pbardea pbardea requested a review from dt July 28, 2020 20:44
@pbardea
Copy link
Contributor Author

pbardea commented Jul 28, 2020

TFTR!
bors r+

@craig
Copy link
Contributor

craig bot commented Jul 28, 2020

Build succeeded:

@craig craig bot merged commit 044881d into cockroachdb:master Jul 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants