dilim/containerd
1
0
Fork 0
mirror of https://github.com/containerd/containerd.git synced 2026-08-13 17:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13654 from crawfordxx/fix-createcontainer-reject-stopped-sandbox

Browse Source 
cri: reject CreateContainer when sandbox is not running
This commit is contained in:
Maksym Pavlenko
2026-06-25 19:01:36 +00:00
committed by GitHub
parent 9ffb2ed974 ae30a5cad2
commit 028999d45d
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
internal/cri/server/container_create.go
View File

@@ -43,7 +43,7 @@ import (
crilabels "github.com/containerd/containerd/v2/internal/cri/labels"
customopts "github.com/containerd/containerd/v2/internal/cri/opts"
containerstore "github.com/containerd/containerd/v2/internal/cri/store/container"
"github.com/containerd/containerd/v2/internal/cri/store/sandbox"
sandboxstore "github.com/containerd/containerd/v2/internal/cri/store/sandbox"
"github.com/containerd/containerd/v2/internal/cri/util"
"github.com/containerd/containerd/v2/internal/registrar"
"github.com/containerd/containerd/v2/pkg/blockio"
@@ -76,6 +76,9 @@ func (c *criService) CreateContainer(ctx context.Context, r *runtime.CreateConta
sandboxID = cstatus.SandboxID
sandboxPid = cstatus.Pid
)
if sandbox.Status.Get().State != sandboxstore.StateReady {
return nil, fmt.Errorf("sandbox container %q is not running", sandboxID)
}
span.SetAttributes(
tracing.Attribute("sandbox.id", sandboxID),
tracing.Attribute("sandbox.pid", sandboxPid),
@@ -215,7 +218,7 @@ func (c *criService) CreateContainer(ctx context.Context, r *runtime.CreateConta
type createContainerRequest struct {
ctx context.Context
containerID string
sandbox *sandbox.Sandbox
sandbox *sandboxstore.Sandbox
sandboxID string
imageID string
containerConfig *runtime.ContainerConfig