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

Merge pull request #2935 from jhowardmsft/jjh/rightexitcode

Browse Source 
Windows: Publish exit status correctly in TaskExit
This commit is contained in:
Michael Crosby 2019-01-15 15:17:11 -05:00 committed by GitHub
commit 7d75a3f282
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
runtime/v2/runhcs/process.go
View File

@ -21,7 +21,6 @@ package runhcs
import ( import (
"context" "context"
"os" "os"
"os/exec"
"sync" "sync"
"sync/atomic" "sync/atomic"
"syscall" "syscall"
@ -69,15 +68,14 @@ func waitForProcess(ctx context.Context, process *process, p *os.Process, s *ser
}) })
var status int var status int
_, eerr := p.Wait() processState, eerr := p.Wait()
if eerr != nil { if eerr != nil {
status = 255 status = 255
if exitErr, ok := eerr.(*exec.ExitError); ok { p.Kill()
if ws, ok := exitErr.Sys().(syscall.WaitStatus); ok { } else {
status = ws.ExitStatus() status = processState.Sys().(syscall.WaitStatus).ExitStatus()
}
}
} }
now := time.Now() now := time.Now()
process.exit.Store(&processExit{ process.exit.Store(&processExit{
pid: pid, pid: pid,