github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9492 from mikedanese/e2e-etcd-sigkill

Browse Source 
Etcd e2e: retry pod delete if etcd is slow to come back from a SIGKILL
This commit is contained in:
krousey 2015-06-09 12:43:11 -07:00
commit c1e9a413a3
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/e2e/etcd_failure.go
View File

@ -121,13 +121,18 @@ func checkExistingRCRecovers(f Framework) {
rcSelector := labels.Set{"name": "baz"}.AsSelector() rcSelector := labels.Set{"name": "baz"}.AsSelector()
By("deleting pods from existing replication controller") By("deleting pods from existing replication controller")
pods, err := podClient.List(rcSelector, fields.Everything()) expectNoError(wait.Poll(time.Millisecond*500, time.Second*30, func() (bool, error) {
Expect(err).NotTo(HaveOccurred()) pods, err := podClient.List(rcSelector, fields.Everything())
Expect(len(pods.Items) > 0).Should(BeTrue())
for _, pod := range pods.Items {
err = podClient.Delete(pod.Name, api.NewDeleteOptions(0))
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
} if len(pods.Items) == 0 {
return false, nil
}
for _, pod := range pods.Items {
err = podClient.Delete(pod.Name, api.NewDeleteOptions(0))
Expect(err).NotTo(HaveOccurred())
}
return true, nil
}))
By("waiting for replication controller to recover") By("waiting for replication controller to recover")
expectNoError(wait.Poll(time.Millisecond*500, time.Second*30, func() (bool, error) { expectNoError(wait.Poll(time.Millisecond*500, time.Second*30, func() (bool, error) {