jobs: refresh job details before removing protected timestamps #92586
Conversation
This file contains 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
|
This change is |
ajwerner
reviewed
Nov 28, 2022
There was a problem hiding this comment.
Reviewable status:
complete! 0 of 0 LGTMs obtained (waiting on @fqazi)
pkg/jobs/jobsprotectedts/jobs_protected_ts_manager.go line 205 at r1 (raw file):
// executing. func (p *Manager) Unprotect(ctx context.Context, job *jobs.Job) error { return p.db.Txn(ctx, func(ctx context.Context, txn *kv.Txn) error {
I think you can simplify this to:
return job.Update(ctx, nil /* txn */, func(txn *kv.Txn, md jobs.JobMetadata, ju *jobs.JobUpdater) error {
// check the job details here etc
})
fqazi
force-pushed
the
protectedTSLegacySC
branch
from
1ca05a8
to
0f88996
Compare
fqazi
commented
Nov 28, 2022
There was a problem hiding this comment.
Reviewable status:
pkg/jobs/jobsprotectedts/jobs_protected_ts_manager.go line 205 at r1 (raw file):
Previously, ajwerner wrote…
I think you can simplify this to:
return job.Update(ctx, nil /* txn */, func(txn *kv.Txn, md jobs.JobMetadata, ju *jobs.JobUpdater) error { // check the job details here etc })
Yes good point, should have done this much earlier
Done.
ajwerner
approved these changes
Nov 28, 2022
There was a problem hiding this comment.
Reviewed 1 of 1 files at r2, all commit messages.
Reviewable status:
|
bors r+ |
Fixes: cockroachdb#92493 Previously, we added the protected timestamps manager into the jobs frame work, which made it easier to automatically add and remove protected timestamps for jobs. Unfortunately, the Unprotect API when invoked from a clean up function never properly refreshed the job. Which could lead to a race condition trying to remove protected timestamps for schema changes. To address this, the Unprotect function will take advantage of the job update function to confirm that a refreshed copy does have protected timestamps set. Release note: None
fqazi
force-pushed
the
protectedTSLegacySC
branch
from
0f88996
to
02867ed
Compare
|
Canceled. |
|
bors r+ |
|
Build succeeded: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes: #92493
Previously, we added the protected timestamps manager into the jobs frame work, which made it easier to automatically add and remove protected timestamps for jobs. Unfortunately, the Unprotect API when invoked from a clean up function never properly refreshed the job. Which could lead to a race condition trying to remove protected timestamps for schema changes. To address this, the Unprotect function will take advantage of the job update function to confirm that a refreshed copy does have protected timestamps set.
Release note: None