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

store: serialize container deletion #1722

Merged
merged 2 commits into from
Sep 27, 2023
Merged

store: serialize container deletion #1722

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c985295
store: remove redundant code
giuseppe Sep 27, 2023
9a05ac9
store: serialize container deletion
giuseppe Sep 27, 2023
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
13 changes: 1 addition & 12 deletions store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2666,34 +2666,23 @@ func (s *store) DeleteContainer(id string) error {
}

var wg multierror.Group
wg.Go(func() error { return s.containerStore.Delete(id) })

middleDir := s.graphDriverName + "-containers"

wg.Go(func() error {
gcpath := filepath.Join(s.GraphRoot(), middleDir, container.ID)
// attempt a simple rm -rf first
if err := os.RemoveAll(gcpath); err == nil {
return nil
}
// and if it fails get to the more complicated cleanup
return system.EnsureRemoveAll(gcpath)
})

wg.Go(func() error {
rcpath := filepath.Join(s.RunRoot(), middleDir, container.ID)
// attempt a simple rm -rf first
if err := os.RemoveAll(rcpath); err == nil {
return nil
}
// and if it fails get to the more complicated cleanup
return system.EnsureRemoveAll(rcpath)
})

if multierr := wg.Wait(); multierr != nil {
return multierr.ErrorOrNil()
}
return nil
return s.containerStore.Delete(id)
})
}

Expand Down