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-20.2: backupccl: fix NPE during restore rollback #54289

Merged
merged 1 commit into from
Sep 12, 2020

Conversation

pbardea
Copy link
Contributor

@pbardea pbardea commented Sep 11, 2020

Backport 1/1 commits from #53928.

/cc @cockroachdb/release


This commit fixes an NPE that happens during the rollback if the RESTORE
fails or is canceled before the execCfg is set on the resumer. The
execCfg should be removed from the resumer, but that change should be
left for a separate commit.

Fixes #52383.

Release justification: bug fix
Release note (bug fix): RESTOREs that have been cancelled may have
crashed a node. This is now fixed.

This commit fixes an NPE that happens during the rollback if the RESTORE
fails or is canceled before the execCfg is set on the resumer. The
execCfg should be removed from the resumer, but that change should be
left for a separate commit.

Release justification: bug fix
Release note (bug fix): RESTOREs that have been cancelled may have
crashed a node. This is now fixed.
@pbardea pbardea requested review from dt, thoszhang and a team September 11, 2020 23:49
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Contributor

@thoszhang thoszhang left a comment

Choose a reason for hiding this comment

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

Thanks!

@pbardea pbardea merged commit a3f2d95 into cockroachdb:release-20.2 Sep 12, 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.

3 participants