JOJ/JOJ3
25
6
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(executor/local): use syscall kill
All checks were successful
build / build (push) Successful in 1m36s
Details
build / trigger-build-image (push) Successful in 11s
Details
submodules sync / sync (push) Successful in 36s
Details

Browse Source
This commit is contained in:
张泊明518370910136 2025-03-21 04:37:37 -04:00
parent 14961db8f0
commit 2248d4e318
Signed by: 张泊明518370910136
GPG Key ID: D47306D7062CDA9D
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/executor/local/executor.go
View File

@ -101,6 +101,7 @@ func (e *Local) Run(cmds []stage.Cmd) ([]stage.ExecutorResult, error) {
for _, cmd := range cmds { for _, cmd := range cmds {
execCmd := exec.Command(cmd.Args[0], cmd.Args[1:]...) // #nosec G204 execCmd := exec.Command(cmd.Args[0], cmd.Args[1:]...) // #nosec G204
execCmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
if cmd.CPULimit > 0 && cmd.ClockLimit <= 0 { if cmd.CPULimit > 0 && cmd.ClockLimit <= 0 {
cmd.ClockLimit = cmd.CPULimit * 2 cmd.ClockLimit = cmd.CPULimit * 2
} }
@ -158,8 +159,8 @@ func (e *Local) Run(cmds []stage.Cmd) ([]stage.ExecutorResult, error) {
) )
results = append(results, result) results = append(results, result)
case <-time.After(duration): case <-time.After(duration):
_ = execCmd.Process.Kill() _ = syscall.Kill(-execCmd.Process.Pid, syscall.SIGKILL)
err := execCmd.Wait() err := <-done
result := e.generateResult( result := e.generateResult(
err, err,
execCmd.ProcessState, execCmd.ProcessState,