github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32062 from gmarek/gc_timeout

Browse Source 
Automatic merge from submit-queue

Increase GC timeout for RCs bigger than 40k

cc @caesarxuchao
This commit is contained in:
Kubernetes Submit Queue
2016-09-05 03:45:30 -07:00
committed by GitHub
parent 2352464853 d990720c12
commit 921ab5070f
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test/e2e/framework/util.go
View File

@@ -163,6 +163,10 @@ const (
// Number of times we want to retry Updates in case of conflict
UpdateRetries = 5
// Number of objects that gc can delete in a second.
// GC issues 2 requestes for single delete.
gcThroughput = 10
)
var (
@@ -3354,17 +3358,16 @@ func DeleteRCAndWaitForGC(c *client.Client, ns, name string) error {
var interval, timeout time.Duration
switch {
case rc.Spec.Replicas < 100:
interval = 10 * time.Millisecond
timeout = 10 * time.Minute
interval = 100 * time.Millisecond
case rc.Spec.Replicas < 1000:
interval = 1 * time.Second
timeout = 10 * time.Minute
case rc.Spec.Replicas < 10000:
interval = 10 * time.Second
timeout = 10 * time.Minute
default:
interval = 10 * time.Second
timeout = 40 * time.Minute
}
if rc.Spec.Replicas < 5000 {
timeout = 10 * time.Minute
} else {
timeout = time.Duration(rc.Spec.Replicas / gcThroughput)
}
err = waitForPodsInactive(ps, interval, timeout)
if err != nil {