github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-01 08:56:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4571 from fidencio/topic/stable-2.4-set-status-if-wait-process-failed

Browse Source 
stable-2.4 | shim: set a non-zero return code if the wait process call failed.
This commit is contained in:
GabyCT
2022-07-01 11:28:35 -05:00
committed by GitHub
parent 5d50fc3908 025e3ea6ab
commit ca7bb9dceb
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/runtime/pkg/containerd-shim-v2/wait.go
View File

@@ -53,6 +53,11 @@ func wait(ctx context.Context, s *service, c *container, execID string) (int32,
"container": c.id, "container": c.id,
"pid": processID, "pid": processID,
}).Error("Wait for process failed") }).Error("Wait for process failed")
// set return code if wait failed
if ret == 0 {
ret = exitCode255
}
} }
timeStamp := time.Now() timeStamp := time.Now()

2
src/runtime/virtcontainers/sandbox.go
View File

@@ -1593,7 +1593,7 @@ func (s *Sandbox) ResumeContainer(ctx context.Context, containerID string) error
} }
// createContainers registers all containers, create the // createContainers registers all containers, create the
// containers in the guest and starts one shim per container. // containers in the guest.
func (s *Sandbox) createContainers(ctx context.Context) error { func (s *Sandbox) createContainers(ctx context.Context) error {
span, ctx := katatrace.Trace(ctx, s.Logger(), "createContainers", sandboxTracingTags, map[string]string{"sandbox_id": s.id}) span, ctx := katatrace.Trace(ctx, s.Logger(), "createContainers", sandboxTracingTags, map[string]string{"sandbox_id": s.id})
defer span.End() defer span.End()