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

Return exit status from Wait of stopped process

Browse Source 
This changes Wait() from returning an error whenever you call wait on a
stopped process/task to returning the exit status from the process.

This also adds the exit status to the Status() call on a process/task so
that a user can Wait(), check status, then cancel the wait to avoid
races in event handling.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby
2017-08-03 17:09:16 -04:00
parent 0fa76584f8
commit 9f13b414b9
16 changed files with 283 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
container_test.go
View File

@@ -1028,13 +1028,13 @@ func TestWaitStoppedTask(t *testing.T) {
}
// wait for the task to stop then call wait again
<-statusC
_, err = task.Wait(ctx)
if err == nil {
t.Error("Wait after task exits should return an error")
status, err := task.Wait(ctx)
if err != nil {
t.Error(err)
return
}
if !errdefs.IsUnavailable(err) {
t.Errorf("Wait should return %q when task Stopped: %v", errdefs.ErrUnavailable, err)
if status != 7 {
t.Errorf("exit status from stopped task should be 7 but received %d", status)
}
}
@@ -1119,13 +1119,13 @@ func TestWaitStoppedProcess(t *testing.T) {
// wait for the exec to return
<-processStatusC
// try to wait on the process after it has stopped
_, err = process.Wait(ctx)
if err == nil {
t.Error("Wait after process exits should return an error")
status, err := process.Wait(ctx)
if err != nil {
t.Error(err)
return
}
if !errdefs.IsUnavailable(err) {
t.Errorf("Wait should return %q when process has exited: %v", errdefs.ErrUnavailable, err)
if status != 6 {
t.Errorf("exit status from stopped process should be 6 but received %d", status)
}
if err := task.Kill(ctx, syscall.SIGKILL); err != nil {
t.Error(err)