Merge pull request #183 from davidwtf/fix/container-not-found

Fix container not found error
Mirantis · Apr 19, 2023 · a7a00a5 · a7a00a5
2 parents ac2fabe + ac510b9
commit a7a00a5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/core/container_list.go b/core/container_list.go
@@ -18,6 +18,8 @@ package core
 
 import (
 	"context"
+
+	"github.com/Mirantis/cri-dockerd/libdocker"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/sirupsen/logrus"
@@ -55,7 +57,7 @@ func (ds *dockerService) ListContainers(
 		}
 	}
 	containers, err := ds.client.ListContainers(opts)
-	if err != nil {
+	if err != nil && !libdocker.IsContainerNotFoundError(err) {
 		return nil, err
 	}
 	// Convert docker to runtime api containers.

diff --git a/core/container_stop.go b/core/container_stop.go
@@ -18,8 +18,13 @@ package core
 
 import (
 	"context"
-	v1 "k8s.io/cri-api/pkg/apis/runtime/v1"
 	"time"
+
+	"github.com/Mirantis/cri-dockerd/libdocker"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+
+	v1 "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
 // StopContainer stops a running container with a grace period (i.e., timeout).
@@ -29,6 +34,9 @@ func (ds *dockerService) StopContainer(
 ) (*v1.StopContainerResponse, error) {
 	err := ds.client.StopContainer(r.ContainerId, time.Duration(r.Timeout)*time.Second)
 	if err != nil {
+		if libdocker.IsContainerNotFoundError(err) {
+			err = status.Error(codes.NotFound, err.Error())
+		}
 		return nil, err
 	}
 	return &v1.StopContainerResponse{}, nil

diff --git a/core/sandbox_list.go b/core/sandbox_list.go
@@ -18,6 +18,8 @@ package core
 
 import (
 	"context"
+
+	"github.com/Mirantis/cri-dockerd/libdocker"
 	"github.com/Mirantis/cri-dockerd/store"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
@@ -78,7 +80,7 @@ func (ds *dockerService) ListPodSandbox(
 	}
 
 	containers, err := ds.client.ListContainers(opts)
-	if err != nil {
+	if err != nil && !libdocker.IsContainerNotFoundError(err) {
 		return nil, err
 	}