UPSTREAM: <carry>: JitterUntil should defer to utilruntime.HandleCrash on panic

derekwaynecarr · smarterclayton · commit bbc7bf37f8fa · 2016-09-26T15:13:29.000-04:00
:100644 100644 c0a6f88... 3208884... M pkg/util/wait/wait.go
diff --git a/pkg/util/wait/wait.go b/pkg/util/wait/wait.go
@@ -20,6 +20,8 @@ import (
 	"errors"
 	"math/rand"
 	"time"
+
+	utilruntime "k8s.io/kubernetes/pkg/util/runtime"
 )
 
 // For any test of the style:
@@ -81,6 +83,8 @@ func JitterUntil(f func(), period time.Duration, jitterFactor float64, sliding b
 		}
 
 		func() {
+			//  Handle crash should decide if we want to exit the process on panic.
+			defer utilruntime.HandleCrash()
 			f()
 		}()
 

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ import (`
`20`	`20`	`"errors"`
`21`	`21`	`"math/rand"`
`22`	`22`	`"time"`
	`23`	`+`
	`24`	`+ utilruntime "k8s.io/kubernetes/pkg/util/runtime"`
`23`	`25`	`)`
`24`	`26`
`25`	`27`	`// For any test of the style:`
`@@ -81,6 +83,8 @@ func JitterUntil(f func(), period time.Duration, jitterFactor float64, sliding b`
`81`	`83`	`}`
`82`	`84`
`83`	`85`	`func() {`
	`86`	`+ // Handle crash should decide if we want to exit the process on panic.`
	`87`	`+ defer utilruntime.HandleCrash()`
`84`	`88`	`f()`
`85`	`89`	`}()`
`86`	`90`