Skip to content

Commit

Permalink
fix closed the remote connection on pull causes service panic
Browse files Browse the repository at this point in the history
Signed-off-by: zhangguanzhang <[email protected]>
  • Loading branch information
zhangguanzhang committed Oct 3, 2020
1 parent ff3aa2b commit e386ca5
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions pkg/channel/writer.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package channel

import (
"fmt"
"io"
"sync"

Expand Down Expand Up @@ -32,16 +33,24 @@ func (w *writeCloser) Chan() <-chan []byte {
}

// Write method for WriteCloser
func (w *writeCloser) Write(b []byte) (int, error) {
func (w *writeCloser) Write(b []byte) (bLen int, err error) {
// https://github.com/containers/podman/issues/7896
// when podman-remote pull image, if it was killed, the server will panic: send on closed channel
// so handle it
defer func() {
if rErr := recover(); rErr != nil {
err = fmt.Errorf("%s", rErr)
}
}()
if w == nil || w.ch == nil {
return 0, errors.New("use channel.NewWriter() to initialize a WriteCloser")
}

w.mux.Lock()
defer w.mux.Unlock()
buf := make([]byte, len(b))
copy(buf, b)
w.ch <- buf
w.mux.Unlock()

return len(b), nil
}
Expand Down

0 comments on commit e386ca5

Please sign in to comment.