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

Merge pull request #30925 from caesarxuchao/gc-concurrency

Browse Source 
Automatic merge from submit-queue

Increase concurrent GC workers, adjust the polling interval and timeout in e2e test

ref: https://github.com/kubernetes/kubernetes/issues/30759#issuecomment-240853949
This commit is contained in:
Kubernetes Submit Queue 2016-08-18 17:10:35 -07:00 committed by GitHub
commit 57ad590d8d
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kube-controller-manager/app/options/options.go
View File

@ -93,7 +93,7 @@ func NewCMServer() *CMServer {
LeaderElection: leaderelection.DefaultLeaderElectionConfiguration(), LeaderElection: leaderelection.DefaultLeaderElectionConfiguration(),
ControllerStartInterval: unversioned.Duration{Duration: 0 * time.Second}, ControllerStartInterval: unversioned.Duration{Duration: 0 * time.Second},
EnableGarbageCollector: false, EnableGarbageCollector: false,
ConcurrentGCSyncs: 5, ConcurrentGCSyncs: 100,
ClusterSigningCertFile: "/etc/kubernetes/ca/ca.pem", ClusterSigningCertFile: "/etc/kubernetes/ca/ca.pem",
ClusterSigningKeyFile: "/etc/kubernetes/ca/ca.key", ClusterSigningKeyFile: "/etc/kubernetes/ca/ca.key",
}, },

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

@ -3131,7 +3131,22 @@ func DeleteRCAndWaitForGC(c *client.Client, ns, name string) error {
} }
deleteRCTime := time.Now().Sub(startTime) deleteRCTime := time.Now().Sub(startTime)
Logf("Deleting RC %s took: %v", name, deleteRCTime) Logf("Deleting RC %s took: %v", name, deleteRCTime)
err = waitForPodsInactive(ps, 10*time.Millisecond, 10*time.Minute) var interval, timeout time.Duration
switch {
case rc.Spec.Replicas < 100:
interval = 10 * time.Millisecond
timeout = 10 * time.Minute
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
}
err = waitForPodsInactive(ps, interval, timeout)
if err != nil { if err != nil {
return fmt.Errorf("error while waiting for pods to become inactive %s: %v", name, err) return fmt.Errorf("error while waiting for pods to become inactive %s: %v", name, err)
} }