JoBoEVD/codapi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(engine): kill docker when timeout

Browse Source
This commit is contained in:
KoaLaYT 2024-04-25 23:19:19 +08:00
parent f250034cd4
commit 4ea4a66b4b
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
internal/engine/docker.go
View File

@ -208,19 +208,6 @@ func (e *Docker) exec(box *config.Box, step *config.Step, req Request, dir strin
} }
if err.Error() == "signal: killed" { if err.Error() == "signal: killed" {
if step.Action == actionRun {
// we have to "docker kill" the container here, because the process
// inside the container is not related to the "docker run" process,
// and will hang forever after the "docker run" process is killed
go func() {
err = dockerKill(req.ID)
if err == nil {
logx.Debug("%s: docker kill ok", req.ID)
} else {
logx.Log("%s: docker kill failed: %v", req.ID, err)
}
}()
}
// context timeout // context timeout
err = ErrTimeout err = ErrTimeout
return return

13
internal/engine/exec.go
View File

@ -41,6 +41,19 @@ func (p *Program) RunStdin(stdin io.Reader, id, name string, arg ...string) (std
cmd.Cancel = func() error { cmd.Cancel = func() error {
err := cmd.Process.Kill() err := cmd.Process.Kill()
logx.Debug("%s: execution timeout, killed process=%d, err=%v", id, cmd.Process.Pid, err) logx.Debug("%s: execution timeout, killed process=%d, err=%v", id, cmd.Process.Pid, err)
if arg[0] == actionRun {
// we have to "docker kill" the container here, because the process
// inside the container is not related to the "docker run" process,
// and will hang forever after the "docker run" process is killed
go func() {
err = dockerKill(id)
if err == nil {
logx.Debug("%s: docker kill ok", id)
} else {
logx.Log("%s: docker kill failed: %v", id, err)
}
}()
}
return err return err
} }