Skip to content

K
k3s
Commit 370a4d6d authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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

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.
parents f189d7f7 47b01997
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
test/e2e/apimachinery/garbage_collector.go
View file @ 370a4d6d
...@@ -646,6 +646,7 @@ var _ = SIGDescribe("Garbage collector", func() { ...@@ -646,6 +646,7 @@ var _ = SIGDescribe("Garbage collector", func() {
} }
By("wait for the rc to be deleted") By("wait for the rc to be deleted")
// TODO: shorten the timeout when we make GC's periodic API rediscovery more efficient. // 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) { if err := wait.Poll(5*time.Second, 90*time.Second, func() (bool, error) {
_, err := rcClient.Get(rc1.Name, metav1.GetOptions{}) _, err := rcClient.Get(rc1.Name, metav1.GetOptions{})
if err == nil { if err == nil {
...@@ -732,7 +733,9 @@ var _ = SIGDescribe("Garbage collector", func() { ...@@ -732,7 +733,9 @@ var _ = SIGDescribe("Garbage collector", func() {
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
var pods *v1.PodList var pods *v1.PodList
var err2 error 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{}) pods, err2 = podClient.List(metav1.ListOptions{})
if err2 != nil { if err2 != nil {
return false, fmt.Errorf("Failed to list pods: %v", err) return false, fmt.Errorf("Failed to list pods: %v", err)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment