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

Merge pull request #91566 from RainbowMango/pr_fix_invalid_recover_in_apiserver

Browse Source 
Fix a wrong usage of recover in apiserver
This commit is contained in:
Kubernetes Prow Robot 2020-05-29 11:56:39 -07:00 committed by GitHub
commit ae1103726f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/apiserver/pkg/util/wsstream/stream.go
View File

@ -63,7 +63,7 @@ type Reader struct {
protocols map[string]ReaderProtocolConfig protocols map[string]ReaderProtocolConfig
selectedProtocol string selectedProtocol string
handleCrash func() // overridable for testing handleCrash func(additionalHandlers ...func(interface{})) // overridable for testing
} }
// NewReader creates a WebSocket pipe that will copy the contents of r to a provided // NewReader creates a WebSocket pipe that will copy the contents of r to a provided
@ -78,7 +78,7 @@ func NewReader(r io.Reader, ping bool, protocols map[string]ReaderProtocolConfig
err: make(chan error), err: make(chan error),
ping: ping, ping: ping,
protocols: protocols, protocols: protocols,
handleCrash: func() { runtime.HandleCrash() }, handleCrash: runtime.HandleCrash,
} }
} }

2
staging/src/k8s.io/apiserver/pkg/util/wsstream/stream_test.go
View File

@ -169,7 +169,7 @@ func TestStreamSurvivesPanic(t *testing.T) {
r := NewReader(errs, false, NewDefaultReaderProtocols()) r := NewReader(errs, false, NewDefaultReaderProtocols())
// do not call runtime.HandleCrash() in handler. Otherwise, the tests are interrupted. // do not call runtime.HandleCrash() in handler. Otherwise, the tests are interrupted.
r.handleCrash = func() { recover() } r.handleCrash = func(additionalHandlers ...func(interface{})) { recover() }
data, err := readWebSocket(r, t, nil) data, err := readWebSocket(r, t, nil)
if !reflect.DeepEqual(data, []byte(input)) { if !reflect.DeepEqual(data, []byte(input)) {