Quellcode durchsuchen

daemon: Handle NotFound when deleting container lease

If the lease doesn't exit (for example when creating the container
failed), just ignore the not found error.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
(cherry picked from commit bedcc94de4cab9f3072a98f71806bc18e47cd072)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Paweł Gronowski vor 1 Jahr
Ursprung
Commit
1d10e8633d
1 geänderte Dateien mit 5 neuen und 2 gelöschten Zeilen
  1. 5 2
      daemon/delete.go

+ 5 - 2
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
+				}
 			}
 		}
 	}