From 1d10e8633d5876517c689b788e39533370cb2c81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Mon, 21 Aug 2023 16:52:32 +0200 Subject: [PATCH] daemon: Handle NotFound when deleting container lease MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If the lease doesn't exit (for example when creating the container failed), just ignore the not found error. Signed-off-by: Paweł Gronowski (cherry picked from commit bedcc94de4cab9f3072a98f71806bc18e47cd072) Signed-off-by: Sebastiaan van Stijn --- daemon/delete.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/daemon/delete.go b/daemon/delete.go index 80cddd91a7..bfd974e5b4 100644 --- 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/docker/docker/api/types" containertypes "github.com/docker/docker/api/types/container" @@ -144,8 +145,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 + } } } }