mirror of
https://github.com/containers/podman.git
synced 2025-09-27 08:43:52 +08:00
fix closed the remote connection on pull causes service panic
Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
This commit is contained in:
@ -1,6 +1,7 @@
|
|||||||
package channel
|
package channel
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
@ -32,16 +33,24 @@ func (w *writeCloser) Chan() <-chan []byte {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Write method for WriteCloser
|
// 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 {
|
if w == nil || w.ch == nil {
|
||||||
return 0, errors.New("use channel.NewWriter() to initialize a WriteCloser")
|
return 0, errors.New("use channel.NewWriter() to initialize a WriteCloser")
|
||||||
}
|
}
|
||||||
|
|
||||||
w.mux.Lock()
|
w.mux.Lock()
|
||||||
|
defer w.mux.Unlock()
|
||||||
buf := make([]byte, len(b))
|
buf := make([]byte, len(b))
|
||||||
copy(buf, b)
|
copy(buf, b)
|
||||||
w.ch <- buf
|
w.ch <- buf
|
||||||
w.mux.Unlock()
|
|
||||||
|
|
||||||
return len(b), nil
|
return len(b), nil
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user