github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 03:11:40 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Fix nil panic propagation
This commit is contained in:
Kubernetes Prow Robot 2019-01-12 09:27:43 -08:00 committed by GitHub
commit d1e5311922
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest.go
View File

@ -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 {