Skip to content

K
k3s
Unverified Commit d1e53119 authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

Merge pull request #72856 from liggitt/nil-panic-propagation

Fix nil panic propagation
parents ef70b115 b8c64e30
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest.go
View file @ d1e53119
...@@ -190,9 +190,9 @@ func finishRequest(timeout time.Duration, fn resultFunc) (result runtime.Object, ...@@ -190,9 +190,9 @@ func finishRequest(timeout time.Duration, fn resultFunc) (result runtime.Object,
buf := make([]byte, size) buf := make([]byte, size)
buf = buf[:goruntime.Stack(buf, false)] buf = buf[:goruntime.Stack(buf, false)]
panicReason = strings.TrimSuffix(fmt.Sprintf("%v\n%s", panicReason, string(buf)), "\n") panicReason = strings.TrimSuffix(fmt.Sprintf("%v\n%s", panicReason, string(buf)), "\n")
// Propagate to parent goroutine
panicCh <- panicReason
} }
// Propagate to parent goroutine
panicCh <- panicReason
}() }()
if result, err := fn(); err != nil { if result, err := fn(); err != nil {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment