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

remove TrimSuffix and document buffer size

Browse Source
This commit is contained in:
Haowei Cai 2019-04-01 11:02:39 -07:00
parent 5c81571b01
commit 0e61b77826
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,6 @@ import (
"net/http" "net/http"
"net/url" "net/url"
goruntime "runtime" goruntime "runtime"
"strings"
"time" "time"
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"
@ -197,10 +196,12 @@ func finishRequest(timeout time.Duration, fn resultFunc) (result runtime.Object,
defer func() { defer func() {
panicReason := recover() panicReason := recover()
if panicReason != nil { if panicReason != nil {
// Same as stdlib http server code. Manually allocate stack
// trace buffer size to prevent excessively large logs
const size = 64 << 10 const size = 64 << 10
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 = fmt.Sprintf("%v\n%s", panicReason, buf)
// Propagate to parent goroutine // Propagate to parent goroutine
panicCh <- panicReason panicCh <- panicReason
} }

2
staging/src/k8s.io/apiserver/pkg/server/filters/timeout.go
View File

@ -99,6 +99,8 @@ func (t *timeoutHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
defer func() { defer func() {
err := recover() err := recover()
if err != nil { if err != nil {
// Same as stdlib http server code. Manually allocate stack
// trace buffer size to prevent excessively large logs
const size = 64 << 10 const size = 64 << 10
buf := make([]byte, size) buf := make([]byte, size)
buf = buf[:runtime.Stack(buf, false)] buf = buf[:runtime.Stack(buf, false)]