github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #7535 from samuelkarp/ip-leakage-flake

Browse Source 
cri: PodSandboxStatus should tolerate missing task
This commit is contained in:
Maksym Pavlenko 2022-10-15 16:51:46 -07:00 committed by GitHub
commit 87b3eec2b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/cri/sbserver/sandbox_status.go
View File

@ -155,12 +155,14 @@ func toCRISandboxInfo(ctx context.Context, sandbox sandboxstore.Sandbox) (map[st
var processStatus containerd.ProcessStatus var processStatus containerd.ProcessStatus
if task != nil { if task != nil {
taskStatus, err := task.Status(ctx) if taskStatus, err := task.Status(ctx); err != nil {
if err != nil { if !errdefs.IsNotFound(err) {
return nil, fmt.Errorf("failed to get task status: %w", err) return nil, fmt.Errorf("failed to get task status: %w", err)
}
processStatus = containerd.Unknown
} else {
processStatus = taskStatus.Status
} }
processStatus = taskStatus.Status
} }
si := &SandboxInfo{ si := &SandboxInfo{

12
pkg/cri/server/sandbox_status.go
View File

@ -155,12 +155,14 @@ func toCRISandboxInfo(ctx context.Context, sandbox sandboxstore.Sandbox) (map[st
var processStatus containerd.ProcessStatus var processStatus containerd.ProcessStatus
if task != nil { if task != nil {
taskStatus, err := task.Status(ctx) if taskStatus, err := task.Status(ctx); err != nil {
if err != nil { if !errdefs.IsNotFound(err) {
return nil, fmt.Errorf("failed to get task status: %w", err) return nil, fmt.Errorf("failed to get task status: %w", err)
}
processStatus = containerd.Unknown
} else {
processStatus = taskStatus.Status
} }
processStatus = taskStatus.Status
} }
si := &SandboxInfo{ si := &SandboxInfo{