github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #50119 from caesarxuchao/increase-gc-timeout-2

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 50119, 48366, 47181, 41611, 49547)

increase the GC e2e test timeout

Fix https://github.com/kubernetes/kubernetes/issues/50047. 

The root cause is #50046. See log analysis in #50047. For now, we just increase the timeout.
This commit is contained in:
Kubernetes Submit Queue 2017-08-04 14:29:32 -07:00 committed by GitHub
commit 370a4d6d4e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e/apimachinery/garbage_collector.go
View File

@ -646,6 +646,7 @@ var _ = SIGDescribe("Garbage collector", func() {
}
By("wait for the rc to be deleted")
// TODO: shorten the timeout when we make GC's periodic API rediscovery more efficient.
// Tracked at https://github.com/kubernetes/kubernetes/issues/50046.
if err := wait.Poll(5*time.Second, 90*time.Second, func() (bool, error) {
_, err := rcClient.Get(rc1.Name, metav1.GetOptions{})
if err == nil {
@ -732,7 +733,9 @@ var _ = SIGDescribe("Garbage collector", func() {
Expect(err).NotTo(HaveOccurred())
var pods *v1.PodList
var err2 error
if err := wait.Poll(5*time.Second, 30*time.Second, func() (bool, error) {
// TODO: shorten the timeout when we make GC's periodic API rediscovery more efficient.
// Tracked at https://github.com/kubernetes/kubernetes/issues/50046.
if err := wait.Poll(5*time.Second, 90*time.Second, func() (bool, error) {
pods, err2 = podClient.List(metav1.ListOptions{})
if err2 != nil {
return false, fmt.Errorf("Failed to list pods: %v", err)