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

avoid blocking on full-pipe conditions for procs that write to stdout, which we continue to ignore

Browse Source
This commit is contained in:
James DeFelice
2015-10-15 21:20:23 +00:00
parent 5174ca21f6
commit df246991e0
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/mesos/pkg/minion/tasks/task.go
View File

@@ -19,6 +19,7 @@ package tasks
import ( import (
"fmt" "fmt"
"io" "io"
"io/ioutil"
"os/exec" "os/exec"
"sync" "sync"
"sync/atomic" "sync/atomic"
@@ -218,10 +219,15 @@ func notStartedTask(t *Task) taskStateFn {
// create command // create command
cmd := exec.Command(t.bin, t.args...) cmd := exec.Command(t.bin, t.args...)
if _, err := cmd.StdoutPipe(); err != nil { stdout, err := cmd.StdoutPipe()
if err != nil {
t.tryError(fmt.Errorf("error getting stdout of %v: %v", t.name, err)) t.tryError(fmt.Errorf("error getting stdout of %v: %v", t.name, err))
return taskShouldRestart return taskShouldRestart
} }
go func() {
defer stdout.Close()
io.Copy(ioutil.Discard, stdout) // TODO(jdef) we might want to save this at some point
}()
stderrLogs, err := cmd.StderrPipe() stderrLogs, err := cmd.StderrPipe()
if err != nil { if err != nil {
t.tryError(fmt.Errorf("error getting stderr of %v: %v", t.name, err)) t.tryError(fmt.Errorf("error getting stderr of %v: %v", t.name, err))