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

Fix panic for task in unknown state.

Browse Source 
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu 2019-09-02 00:50:22 -07:00
parent b5ec5ee4f6
commit c6203ec13b
2 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/server/io/container_io.go
View File

@ -105,6 +105,7 @@ func (c *ContainerIO) Config() cio.Config {
// to output stream. // to output stream.
func (c *ContainerIO) Pipe() { func (c *ContainerIO) Pipe() {
wg := c.closer.wg wg := c.closer.wg
if c.stdout != nil {
wg.Add(1) wg.Add(1)
go func() { go func() {
if _, err := io.Copy(c.stdoutGroup, c.stdout); err != nil { if _, err := io.Copy(c.stdoutGroup, c.stdout); err != nil {
@ -115,8 +116,9 @@ func (c *ContainerIO) Pipe() {
wg.Done() wg.Done()
logrus.Infof("Finish piping stdout of container %q", c.id) logrus.Infof("Finish piping stdout of container %q", c.id)
}() }()
}
if !c.fifos.Terminal { if !c.fifos.Terminal && c.stderr != nil {
wg.Add(1) wg.Add(1)
go func() { go func() {
if _, err := io.Copy(c.stderrGroup, c.stderr); err != nil { if _, err := io.Copy(c.stderrGroup, c.stderr); err != nil {

4
pkg/server/io/helpers.go
View File

@ -120,17 +120,21 @@ func newStdioPipes(fifos *cio.FIFOSet) (_ *stdioPipes, _ *wgCloser, err error) {
set = append(set, f) set = append(set, f)
} }
if fifos.Stdout != "" {
if f, err = fifo.OpenFifo(ctx, fifos.Stdout, syscall.O_RDONLY|syscall.O_CREAT|syscall.O_NONBLOCK, 0700); err != nil { if f, err = fifo.OpenFifo(ctx, fifos.Stdout, syscall.O_RDONLY|syscall.O_CREAT|syscall.O_NONBLOCK, 0700); err != nil {
return nil, nil, err return nil, nil, err
} }
p.stdout = f p.stdout = f
set = append(set, f) set = append(set, f)
}
if fifos.Stderr != "" {
if f, err = fifo.OpenFifo(ctx, fifos.Stderr, syscall.O_RDONLY|syscall.O_CREAT|syscall.O_NONBLOCK, 0700); err != nil { if f, err = fifo.OpenFifo(ctx, fifos.Stderr, syscall.O_RDONLY|syscall.O_CREAT|syscall.O_NONBLOCK, 0700); err != nil {
return nil, nil, err return nil, nil, err
} }
p.stderr = f p.stderr = f
set = append(set, f) set = append(set, f)
}
return p, &wgCloser{ return p, &wgCloser{
wg: &sync.WaitGroup{}, wg: &sync.WaitGroup{},