Tune polling intervals for an overall faster ValidateEgress() (#260)

openshift · Aug 1, 2024 · 87b6710 · 87b6710
1 parent 8024971
commit 87b6710
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/pkg/clients/aws/aws.go b/pkg/clients/aws/aws.go
@@ -155,9 +155,13 @@ func (c *Client) TerminateEC2Instance(ctx context.Context, instanceID string) er
 		return handledErrors.NewGenericError(err)
 	}
 
-	// Wait up to 5 minutes for the instance to be terminated
+	// Wait up to 5 minutes for the instance to be terminated, using a lower
+	// MinDelay than the default 15s so that we don't wait unnecessarily
+	reduceMinDelay := func(i *ec2.InstanceTerminatedWaiterOptions) {
+		i.MinDelay = 3 * time.Second
+	}
 	waiter := ec2.NewInstanceTerminatedWaiter(c)
-	if err := waiter.Wait(ctx, &ec2.DescribeInstancesInput{InstanceIds: []string{instanceID}}, 5*time.Minute); err != nil {
+	if err := waiter.Wait(ctx, &ec2.DescribeInstancesInput{InstanceIds: []string{instanceID}}, 5*time.Minute, reduceMinDelay); err != nil {
 		return handledErrors.NewGenericError(err)
 	}
 

diff --git a/pkg/verifier/aws/aws_verifier.go b/pkg/verifier/aws/aws_verifier.go
@@ -353,7 +353,7 @@ func (a *AwsVerifier) findUnreachableEndpoints(ctx context.Context, instanceID s
 	a.writeDebugLogs(ctx, "Scraping console output and waiting for user data script to complete...")
 
 	// Periodically scrape console output and analyze the logs for any errors or a successful completion
-	err := helpers.PollImmediate(30*time.Second, 4*time.Minute, func() (bool, error) {
+	err := helpers.PollImmediate(10*time.Second, 270*time.Second, func() (bool, error) {
 		b64EncodedConsoleOutput, err := a.AwsClient.GetConsoleOutput(ctx, &ec2.GetConsoleOutputInput{
 			InstanceId: awsTools.String(instanceID),
 			Latest:     awsTools.Bool(true),