github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #67679 from krzyzacy/recover 

Automatic merge from submit-queue (batch tested with PRs 67776, 67503, 67679, 67786, 67830). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

handle recover from panic

The upgrade jobs like https://k8s-gubernator.appspot.com/build/kubernetes-jenkins/logs/ci-kubernetes-e2e-gke-stable1-beta-upgrade-master/700 are panic on this test and didn't print any output

add a recover to the sub go-routine.

/sig-instrumentation
/cc jayunit100
pull/8/head
Kubernetes Submit Queue 2018-08-24 16:50:03 -07:00 committed by GitHub
parent de80c824bd 333fe94bb9
commit d7909d893c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/instrumentation/logging/generic_soak.go
View File

@ -70,11 +70,12 @@ var _ = instrumentation.SIGDescribe("Logging soak [Performance] [Slow] [Disrupti
wg.Add(scale)
for i := 0; i < scale; i++ {
go func() {
defer wg.Done()
defer GinkgoRecover()
wave := fmt.Sprintf("wave%v", strconv.Itoa(i))
framework.Logf("Starting logging soak, wave = %v", wave)
RunLogPodsWithSleepOf(f, kbRateInSeconds, wave, totalLogTime)
framework.Logf("Completed logging soak, wave %v", i)
wg.Done()
}()
// Niceness.
time.Sleep(millisecondsBetweenWaves)