backupccl: fix nil pointer exception in restore OnFailOrCancel#78940
Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom Mar 29, 2022
Merged
backupccl: fix nil pointer exception in restore OnFailOrCancel#78940craig[bot] merged 1 commit intocockroachdb:masterfrom
craig[bot] merged 1 commit intocockroachdb:masterfrom
Conversation
Member
|
This change is |
dt
approved these changes
Mar 29, 2022
stevendanna
approved these changes
Mar 29, 2022
The execCfg field on the restore resumer was not being set correctly in the OnFailOrCancel hook. This would lead to a nil pointer exception during cleanup. Other jobs such as import, backup use the execCfg directly off the JobExecContext instead of storing it on the resumer. An alternative to this fix could be to change all `r.ExecCfg` to use the execCfg on the JobExecContext. Fixes: cockroachdb#76720 Release note (bug fix): Fixes a nil pointer exception during the cleanup of a failed or cancelled restore job.
1614376 to
f9c3d13
Compare
Contributor
Author
|
|
Contributor
Author
|
TFTRs! bors r=dt,stevendanna |
Contributor
|
Build succeeded: |
|
Encountered an error creating backports. Some common things that can go wrong:
You might need to create your backport manually using the backport tool. error creating merge commit from f9c3d13 to blathers/backport-release-21.2-78940: 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 21.2.x failed. See errors above. 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is otan. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The execCfg field on the restore resumer was not being set correctly
in the OnFailOrCancel hook. This would lead to a nil pointer exception
during cleanup.
Other jobs such as import, backup use the execCfg directly off the
JobExecContext instead of storing it on the resumer. An alternative to
this fix could be to change all
r.ExecCfgto use the execCfg on the JobExecContext.Fixes: #76720
Release note (bug fix): Fixes a nil pointer exception during the
cleanup of a failed or cancelled restore job.