Merge pull request #9966 from tthvo/CORS-4078

CORS-4078: bump AWS SDK v2 max backoff duration to 300s

Author: patrickdillon

pkg/asset/installconfig/aws/sessionv2.go

@@ -6,6 +6,7 @@ import (
 	"os"
 	"path/filepath"
 	"sync"
+	"time"
 
 	survey "github.com/AlecAivazis/survey/v2"
 	"github.com/aws/aws-sdk-go-v2/aws"
@@ -31,6 +32,9 @@ const (
 
 	// RetryMaxAttempts is the total number of times an API request is retried.
 	RetryMaxAttempts = 25
+
+	// RetryBackoffDuration is max duration between retried attempts.
+	RetryBackoffDuration = 300 * time.Second
 )
 
 var (
@@ -47,6 +51,12 @@ func getDefaultConfigOptions() ConfigOptions {
 			return retry.NewStandard(func(so *retry.StandardOptions) {
 				so.MaxAttempts = RetryMaxAttempts
 
+				// The SDK v2 implements exponential backoff and jitter by default, but with 20s max backoff duration,
+				// which can cause the installer to aggressively retry.
+				// Thus, setting this to a higher value to allow more rest time and ease AWS API load.
+				// In SDK v1, this value was also 300s: https://github.com/hashicorp/terraform-provider-aws/issues/36837
+				so.Backoff = retry.NewExponentialJitterBackoff(RetryBackoffDuration)
+
 				// The SDK v2 introduces a new client-side rate-limiting mechanism in the standard retry.
 				// The default settings are not a good fit for the installer, especially the destroy code.
 				// Until we figure out a good settings, we disable it to align with SDK v1 behavior.