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

Merge pull request #94292 from Jiawei0227/stress-test

Browse Source 
[e2e]Fail early on stress test and improve logging
This commit is contained in:
Kubernetes Prow Robot 2020-09-22 12:23:11 -07:00 committed by GitHub
commit f2fcbac083
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
test/e2e/storage/testsuites/stress.go
View File

@ -48,8 +48,9 @@ type stressTest struct {
resources []*VolumeResource resources []*VolumeResource
pods []*v1.Pod pods []*v1.Pod
// stop and wait for any async routines // stop and wait for any async routines
wg sync.WaitGroup wg sync.WaitGroup
stopChs []chan struct{} ctx context.Context
cancel context.CancelFunc
testOptions StressTestOptions testOptions StressTestOptions
} }
@ -112,8 +113,8 @@ func (t *stressTestSuite) DefineTests(driver TestDriver, pattern testpatterns.Te
l.migrationCheck = newMigrationOpCheck(f.ClientSet, dInfo.InTreePluginName) l.migrationCheck = newMigrationOpCheck(f.ClientSet, dInfo.InTreePluginName)
l.resources = []*VolumeResource{} l.resources = []*VolumeResource{}
l.pods = []*v1.Pod{} l.pods = []*v1.Pod{}
l.stopChs = []chan struct{}{}
l.testOptions = *dInfo.StressTestOptions l.testOptions = *dInfo.StressTestOptions
l.ctx, l.cancel = context.WithCancel(context.Background())
return l return l
} }
@ -122,9 +123,7 @@ func (t *stressTestSuite) DefineTests(driver TestDriver, pattern testpatterns.Te
var errs []error var errs []error
framework.Logf("Stopping and waiting for all test routines to finish") framework.Logf("Stopping and waiting for all test routines to finish")
for _, stopCh := range l.stopChs { l.cancel()
close(stopCh)
}
l.wg.Wait() l.wg.Wait()
for _, pod := range l.pods { for _, pod := range l.pods {
@ -161,7 +160,6 @@ func (t *stressTestSuite) DefineTests(driver TestDriver, pattern testpatterns.Te
framework.ExpectNoError(err) framework.ExpectNoError(err)
l.pods = append(l.pods, pod) l.pods = append(l.pods, pod)
l.stopChs = append(l.stopChs, make(chan struct{}))
} }
// Restart pod repeatedly // Restart pod repeatedly
@ -173,21 +171,30 @@ func (t *stressTestSuite) DefineTests(driver TestDriver, pattern testpatterns.Te
defer l.wg.Done() defer l.wg.Done()
for j := 0; j < l.testOptions.NumRestarts; j++ { for j := 0; j < l.testOptions.NumRestarts; j++ {
select { select {
case <-l.stopChs[podIndex]: case <-l.ctx.Done():
return return
default: default:
pod := l.pods[podIndex] pod := l.pods[podIndex]
framework.Logf("Pod %v, Iteration %v/%v", podIndex, j, l.testOptions.NumRestarts-1) framework.Logf("Pod-%v [%v], Iteration %v/%v", podIndex, pod.Name, j, l.testOptions.NumRestarts-1)
_, err := cs.CoreV1().Pods(pod.Namespace).Create(context.TODO(), pod, metav1.CreateOptions{}) _, err := cs.CoreV1().Pods(pod.Namespace).Create(context.TODO(), pod, metav1.CreateOptions{})
framework.ExpectNoError(err) if err != nil {
l.cancel()
framework.Failf("Failed to create pod-%v [%+v]. Error: %v", podIndex, pod, err)
}
err = e2epod.WaitForPodRunningInNamespace(cs, pod) err = e2epod.WaitForPodRunningInNamespace(cs, pod)
framework.ExpectNoError(err) if err != nil {
l.cancel()
framework.Failf("Failed to wait for pod-%v [%+v] turn into running status. Error: %v", podIndex, pod, err)
}
// TODO: write data per pod and validate it everytime // TODO: write data per pod and validate it everytime
err = e2epod.DeletePodWithWait(f.ClientSet, pod) err = e2epod.DeletePodWithWait(f.ClientSet, pod)
framework.ExpectNoError(err) if err != nil {
l.cancel()
framework.Failf("Failed to delete pod-%v [%+v]. Error: %v", podIndex, pod, err)
}
} }
} }
}() }()