Merge remote-tracking branch 'origin/master' into release-1.13

Kubernetes-commit: 23dc5401f4e9b985860aeae9657bba1b28c74ff8
This commit is contained in:
Kubernetes Publisher
2018-11-16 20:31:24 -08:00
115 changed files with 4395 additions and 473 deletions
+5 -1
View File
@@ -63,7 +63,11 @@ func HandleCrash(additionalHandlers ...func(interface{})) {
// logPanic logs the caller tree when a panic occurs.
func logPanic(r interface{}) {
callers := getCallers(r)
klog.Errorf("Observed a panic: %#v (%v)\n%v", r, r, callers)
if _, ok := r.(string); ok {
klog.Errorf("Observed a panic: %s\n%v", r, callers)
} else {
klog.Errorf("Observed a panic: %#v (%v)\n%v", r, r, callers)
}
}
func getCallers(r interface{}) string {