summaryrefslogtreecommitdiff
path: root/pkg/channel/writer.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-10-03 05:52:40 -0400
committerGitHub <noreply@github.com>2020-10-03 05:52:40 -0400
commit7c12967257742063206c05f0baec517bc08cbeb6 (patch)
treedb646ceb09fba9da168a1bd27a3e2694b5f191cb /pkg/channel/writer.go
parent01c7ae640714de63be92bd05577ee9ce125d391b (diff)
parente386ca5db723efd59a86b8d0ef2dfed7918ce767 (diff)
downloadpodman-7c12967257742063206c05f0baec517bc08cbeb6.tar.gz
podman-7c12967257742063206c05f0baec517bc08cbeb6.tar.bz2
podman-7c12967257742063206c05f0baec517bc08cbeb6.zip
Merge pull request #7899 from zhangguanzhang/service-panic-client-kill
[podman-remote] Fix closed connection on pull causes service panic
Diffstat (limited to 'pkg/channel/writer.go')
-rw-r--r--pkg/channel/writer.go13
1 files changed, 11 insertions, 2 deletions
diff --git a/pkg/channel/writer.go b/pkg/channel/writer.go
index dbb38e416..28c9d7de5 100644
--- a/pkg/channel/writer.go
+++ b/pkg/channel/writer.go
@@ -1,6 +1,7 @@
package channel
import (
+ "fmt"
"io"
"sync"
@@ -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
}