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

Merge pull request #10345 from wojtek-t/increase_rc_timeout

Browse Source 
Increase timeout for waiting for pods running in load test
This commit is contained in:
Maxwell Forbes 2015-06-25 10:00:05 -07:00
commit 8b0efe8b85
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/load.go
View File

@ -157,6 +157,7 @@ func generateRCConfigsForGroup(c *client.Client, ns, groupName string, size, cou
Client: c,
Name: groupName + "-" + strconv.Itoa(i),
Namespace: ns,
Timeout: 10 * time.Minute,
Image: image,
Replicas: size,
}

7
test/e2e/util.go
View File

@ -157,6 +157,7 @@ type RCConfig struct {
Name string
Namespace string
PollInterval time.Duration
Timeout time.Duration
PodStatusFile *os.File
Replicas int
@ -966,10 +967,14 @@ func RunRC(config RCConfig) error {
if interval <= 0 {
interval = 10 * time.Second
}
timeout := config.Timeout
if timeout <= 0 {
timeout = 5 * time.Minute
}
oldPods := make([]*api.Pod, 0)
oldRunning := 0
lastChange := time.Now()
for oldRunning != config.Replicas && time.Since(lastChange) < 5*time.Minute {
for oldRunning != config.Replicas && time.Since(lastChange) < timeout {
time.Sleep(interval)
running := 0