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.

Sign up for GitHub

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

fix(jobsdb): race - repeat job count calculation after acquiring migration lock #2583

Merged
merged 1 commit into from
Oct 19, 2022
Merged

fix(jobsdb): race - repeat job count calculation after acquiring migration lock #2583

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions jobsdb/jobsdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3090,6 +3090,11 @@ func (jd *HandleT) doMigrateDS(ctx context.Context) error {
return fmt.Errorf("failed to acquire lock: %w", ctx.Err())
}
defer jd.dsMigrationLock.Unlock()
// repeat the check after the dsMigrationLock is acquired to get correct pending jobs count.
// the pending jobs count cannot change after the dsMigrationLock is acquired
if migrateFrom, pendingJobsCount, insertBeforeDS = jd.getMigrationList(dsList); len(migrateFrom) == 0 {
return nil
}

if pendingJobsCount > 0 { // migrate incomplete jobs
var destination dataSetT
Expand Down