github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Propagate the panic with a channel

Browse Source 
Signed-off-by: arkbriar <arkbriar@gmail.com>
This commit is contained in:
arkbriar 2022-11-02 11:36:22 +08:00
parent 86e5d069ec
commit b7e6c23e9f
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
staging/src/k8s.io/client-go/tools/remotecommand/remotecommand.go
View File

@ -27,9 +27,8 @@ import (
"k8s.io/apimachinery/pkg/util/httpstream" "k8s.io/apimachinery/pkg/util/httpstream"
"k8s.io/apimachinery/pkg/util/remotecommand" "k8s.io/apimachinery/pkg/util/remotecommand"
"k8s.io/apimachinery/pkg/util/runtime"
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
spdy "k8s.io/client-go/transport/spdy" "k8s.io/client-go/transport/spdy"
) )
// StreamOptions holds information pertaining to the current streaming session: // StreamOptions holds information pertaining to the current streaming session:
@ -161,14 +160,20 @@ func (e *streamExecutor) StreamWithContext(ctx context.Context, options StreamOp
} }
defer conn.Close() defer conn.Close()
panicChan := make(chan any, 1)
errorChan := make(chan error, 1) errorChan := make(chan error, 1)
go func() { go func() {
defer runtime.HandleCrash() defer func() {
defer close(errorChan) if p := recover(); p != nil {
panicChan <- p
}
}()
errorChan <- streamer.stream(conn) errorChan <- streamer.stream(conn)
}() }()
select { select {
case p := <-panicChan:
panic(p)
case err := <-errorChan: case err := <-errorChan:
return err return err
case <-ctx.Done(): case <-ctx.Done():