burble/nomad-driver-containerd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ordering: container and task delete.

Browse Source
This commit is contained in:
Shishir Mahajan 2020-05-11 18:14:48 -07:00
parent 433b9b30fb
commit f7e7f50c6e
No known key found for this signature in database
GPG Key ID: D41782E7688DEC4A
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
containerd/handle.go
View File

@ -68,10 +68,10 @@ func (h *taskHandle) shutdown(ctxContainerd context.Context, signal syscall.Sign
}
func (h *taskHandle) cleanup(ctxContainerd context.Context) error {
if err := h.container.Delete(ctxContainerd, containerd.WithSnapshotCleanup); err != nil {
if _, err := h.task.Delete(ctxContainerd); err != nil {
return err
}
if _, err := h.task.Delete(ctxContainerd); err != nil {
if err := h.container.Delete(ctxContainerd, containerd.WithSnapshotCleanup); err != nil {
return err
}
return nil