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

Set startTimeout back to 3m, restore wait loop at end of test

Browse Source
This commit is contained in:
Elana Hashman 2021-11-18 14:59:01 -08:00
parent b4a8861af3
commit 6ddf86d422
No known key found for this signature in database
GPG Key ID: D37F7B2A20B48FA0
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/e2e_node/restart_test.go
View File

@ -73,7 +73,7 @@ var _ = SIGDescribe("Restart [Serial] [Slow] [Disruptive]", func() {
podCount = 100 podCount = 100
podCreationInterval = 100 * time.Millisecond podCreationInterval = 100 * time.Millisecond
recoverTimeout = 5 * time.Minute recoverTimeout = 5 * time.Minute
startTimeout = 5 * time.Minute startTimeout = 3 * time.Minute
// restartCount is chosen so even with minPods we exhaust the default // restartCount is chosen so even with minPods we exhaust the default
// allocation of a /24. // allocation of a /24.
minPods = 50 minPods = 50
@ -165,7 +165,7 @@ var _ = SIGDescribe("Restart [Serial] [Slow] [Disruptive]", func() {
pod.Spec.RestartPolicy = "Never" pod.Spec.RestartPolicy = "Never"
pod.Spec.Containers[0].Command = []string{"echo", "hi"} pod.Spec.Containers[0].Command = []string{"echo", "hi"}
pod.Spec.Containers[0].Resources.Limits = v1.ResourceList{ pod.Spec.Containers[0].Resources.Limits = v1.ResourceList{
v1.ResourceCPU: resource.MustParse("950m"), // leave a little room for other workloads v1.ResourceCPU: resource.MustParse("950m"), // leave a little room for other workloads
} }
} }
createBatchPodWithRateControl(f, restartNeverPods, podCreationInterval) createBatchPodWithRateControl(f, restartNeverPods, podCreationInterval)
@ -203,9 +203,11 @@ var _ = SIGDescribe("Restart [Serial] [Slow] [Disruptive]", func() {
// restart may think these old pods are consuming CPU and we // restart may think these old pods are consuming CPU and we
// will get an OutOfCpu error. // will get an OutOfCpu error.
ginkgo.By("verifying restartNever pods succeed and restartAlways pods stay running") ginkgo.By("verifying restartNever pods succeed and restartAlways pods stay running")
postRestartRunningPods := waitForPods(f, numAllPods, recoverTimeout) for start := time.Now(); time.Since(start) < startTimeout; time.Sleep(10 * time.Second) {
if len(postRestartRunningPods) < numAllPods { postRestartRunningPods := waitForPods(f, numAllPods, recoverTimeout)
framework.Failf("less pods are running after node restart, got %d but expected %d", len(postRestartRunningPods), numAllPods) if len(postRestartRunningPods) < numAllPods {
framework.Failf("less pods are running after node restart, got %d but expected %d", len(postRestartRunningPods), numAllPods)
}
} }
}) })
}) })