Increase timeout for waiting for RC in load test

This commit is contained in:
Wojciech Tyczynski 2015-06-25 12:11:01 +02:00
parent 91fc1af928
commit c151f6bc1f
2 changed files with 7 additions and 1 deletions

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,
}

View File

@ -157,6 +157,7 @@ type RCConfig struct {
Name string
Namespace string
PollInterval time.Duration
Timeout time.Duration
PodStatusFile *os.File
Replicas int
@ -969,10 +970,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