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 a panic related to batch GC #4903

Merged
merged 4 commits into from
Nov 20, 2018
Merged

Fix a panic related to batch GC #4903

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
616ef21
Reproduce a panic related to batch GC
Nov 20, 2018
cf51bc6
Fix a panic related to batch GC
Nov 20, 2018
10b073a
add a missing no errorassertion
Nov 20, 2018
72df87b
address review comments
Nov 20, 2018
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
Prev Previous commit
Next Next commit
Fix a panic related to batch GC 
`deleteJobVersions` does concurrent modifications to iterated items
while iterating, by deleting job versions while it's iterating on them,
  • Loading branch information
Mahmood Ali committed Nov 20, 2018
commit cf51bc62e47eab93cad27d1eb4d3fb7780d0f760
10 changes: 9 additions & 1 deletion nomad/state/state_store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1126,6 +1126,9 @@ func (s *StateStore) deleteJobVersions(index uint64, job *structs.Job, txn *memd
return err
}

// Put them into a slice so there are no safety concerns while actually
// performing the deletes
jobs := []*structs.Job{}
for {
raw := iter.Next()
if raw == nil {
Expand All @@ -1138,7 +1141,12 @@ func (s *StateStore) deleteJobVersions(index uint64, job *structs.Job, txn *memd
continue
}

if _, err = txn.DeleteAll("job_version", "id", j.Namespace, j.ID, j.Version); err != nil {
jobs = append(jobs, j)
}

// Do the deletes
for _, j := range jobs {
if err := txn.Delete("job_version", j); err != nil {
return fmt.Errorf("deleting job versions failed: %v", err)
}
}
Expand Down