*: update ec2 poll timeout

Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
aws · May 24, 2020 · 9423d17 · 9423d17
1 parent 9352ba6
commit 9423d17
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/ec2/asgs.go b/ec2/asgs.go
@@ -588,8 +588,9 @@ func (ts *Tester) createASGs() (err error) {
 			zap.String("asg-name", asgName),
 			zap.Strings("instance-ids", instanceIDs),
 		)
+		waitDur := 3*time.Minute + time.Duration(10*cur.ASGDesiredCapacity)*time.Second
 		ec2Instances, err := aws_ec2.PollUntilRunning(
-			10*time.Minute,
+			waitDur,
 			ts.lg,
 			ts.ec2API,
 			instanceIDs...,

diff --git a/eks/mng/nodes.go b/eks/mng/nodes.go
@@ -767,7 +767,6 @@ func (ts *tester) waitForNodes(mngName string) error {
 	if !ok {
 		return fmt.Errorf("Managed Node Group %q not found", mngName)
 	}
-	waitDur := 2*time.Minute + time.Duration(15*cur.ASGDesiredCapacity)*time.Second
 
 	ts.cfg.Logger.Info("checking MNG", zap.String("mng-name", cur.Name))
 	dout, err := ts.cfg.EKSAPI.DescribeNodegroup(&eks.DescribeNodegroupInput{
@@ -824,6 +823,7 @@ func (ts *tester) waitForNodes(mngName string) error {
 		zap.String("asg-name", cur.ASGName),
 		zap.Strings("instance-ids", instanceIDs),
 	)
+	waitDur := 3*time.Minute + time.Duration(10*cur.ASGDesiredCapacity)*time.Second
 	ec2Instances, err := aws_ec2.PollUntilRunning(
 		waitDur,
 		ts.cfg.Logger,

diff --git a/eks/ng/nodes.go b/eks/ng/nodes.go
@@ -703,7 +703,6 @@ func (ts *tester) waitForNodes(asgName string) error {
 	if !ok {
 		return fmt.Errorf("Node Group %q not found", asgName)
 	}
-	waitDur := 3*time.Minute + time.Duration(15*cur.ASGDesiredCapacity)*time.Second
 
 	aout, err := ts.cfg.ASGAPI.DescribeAutoScalingGroups(&autoscaling.DescribeAutoScalingGroupsInput{
 		AutoScalingGroupNames: aws.StringSlice([]string{cur.Name}),
@@ -727,6 +726,7 @@ func (ts *tester) waitForNodes(asgName string) error {
 		zap.Strings("instance-ids", instanceIDs),
 		zap.Duration("wait", waitDur),
 	)
+	waitDur := 3*time.Minute + time.Duration(10*cur.ASGDesiredCapacity)*time.Second
 	ec2Instances, err := aws_ec2.PollUntilRunning(
 		waitDur,
 		ts.cfg.Logger,

diff --git a/pkg/aws/ec2/ec2.go b/pkg/aws/ec2/ec2.go
@@ -28,11 +28,11 @@ func PollUntilRunning(
 	lg.Info("polling instance status", zap.Int("target-total", targetN))
 	retryStart := time.Now()
 	for time.Now().Sub(retryStart) < timeout {
-		// batch by 10
-		batch := make([]string, 0, 10)
+		// batch by 30
+		batch := make([]string, 0, 30)
 		for id := range left {
 			batch = append(batch, id)
-			if len(batch) >= 10 {
+			if len(batch) >= 30 {
 				break
 			}
 		}
@@ -71,7 +71,7 @@ func PollUntilRunning(
 		if len(left) == 0 {
 			break
 		}
-		time.Sleep(15 * time.Second)
+		time.Sleep(10 * time.Second)
 	}
 
 	return ec2Instances, err