daemon: Handle NotFound when deleting container lease

vvoland · vvoland · commit bedcc94de4ca · 2023-08-22T17:32:22.000+02:00
If the lease doesn't exit (for example when creating the container
failed), just ignore the not found error.

Signed-off-by: Pawe&#322; Gronowski &lt;pawel.gronowski@docker.com&gt;
diff --git a/daemon/delete.go b/daemon/delete.go
@@ -8,6 +8,7 @@ import (
 	"strings"
 	"time"
 
+	cerrdefs "github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/leases"
 	"github.com/containerd/containerd/log"
 	"github.com/docker/docker/api/types"
@@ -149,8 +150,10 @@ func (daemon *Daemon) cleanupContainer(container *container.Container, config ty
 				ID: container.ID,
 			}
 			if err := ls.Delete(context.Background(), lease, leases.SynchronousDelete); err != nil {
-				container.SetRemovalError(err)
-				return err
+				if !cerrdefs.IsNotFound(err) {
+					container.SetRemovalError(err)
+					return err
+				}
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import (`
`8`	`8`	`"strings"`
`9`	`9`	`"time"`
`10`	`10`
	`11`	`+ cerrdefs "github.com/containerd/containerd/errdefs"`
`11`	`12`	`"github.com/containerd/containerd/leases"`
`12`	`13`	`"github.com/containerd/containerd/log"`
`13`	`14`	`"github.com/docker/docker/api/types"`
`@@ -149,8 +150,10 @@ func (daemon Daemon) cleanupContainer(container container.Container, config ty`
`149`	`150`	`ID: container.ID,`
`150`	`151`	`}`
`151`	`152`	`if err := ls.Delete(context.Background(), lease, leases.SynchronousDelete); err != nil {`
`152`		`- container.SetRemovalError(err)`
`153`		`- return err`
	`153`	`+ if !cerrdefs.IsNotFound(err) {`
	`154`	`+ container.SetRemovalError(err)`
	`155`	`+ return err`
	`156`	`+ }`
`154`	`157`	`}`
`155`	`158`	`}`
`156`	`159`	`}`