fix(gc): Use the status of the sandbox to determine whether the conta…

…iner exists
tkestack · Jan 10, 2024 · 6787bd6 · 6787bd6
1 parent b37f521
commit 6787bd6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/pkg/api/docker/docker.go b/pkg/api/docker/docker.go
@@ -90,15 +90,15 @@ func (d *DockerInterface) DockerInspectContainer(id string) (*dockertypes.Contai
 	return &containerJSON, nil
 }
 
-func (d *DockerInterface) ContainedInspectContainer(id string) (*criapi.ContainerStatus, error) {
+func (d *DockerInterface) ContainedInspectContainer(id string) (*criapi.PodSandboxStatus, error) {
 	ctx, cancel := getTimeoutContext()
 	defer cancel()
 	if os.Getenv("CONTAINERD_HOST") != "" {
-		request := &criapi.ContainerStatusRequest{
-			ContainerId: id,
-			Verbose:     true,
+		request := &criapi.PodSandboxStatusRequest{
+			PodSandboxId: id,
+			Verbose:      true,
 		}
-		resp, err := d.containerdClient.ContainerStatus(ctx, request)
+		resp, err := d.containerdClient.PodSandboxStatus(ctx, request)
 		if err != nil {
 			return nil, err
 		}

diff --git a/pkg/gc/flannel_gc.go b/pkg/gc/flannel_gc.go
@@ -199,7 +199,7 @@ func (gc *flannelGC) shouldCleanup(cid string) bool {
 				glog.Warningf("Error inspect container %s: %v", cid, err)
 			}
 		} else {
-			if c != nil && (c.State == criapi.ContainerState_CONTAINER_EXITED || c.State == criapi.ContainerState_CONTAINER_UNKNOWN) {
+			if c != nil && (c.State == criapi.PodSandboxState_SANDBOX_NOTREADY) {
 				glog.Infof("container %s exited %s", c.Id, c.State.String())
 				return true
 			}