Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Automated cherry pick of #78601: change aws encryptedCheck to exponential backoff #84953

Merged
merged 4 commits into from
Nov 8, 2019
Merged

Automated cherry pick of #78601: change aws encryptedCheck to exponential backoff #84953

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b2fb326
change aws encryptedCheck to exponential backoff
May 31, 2019
3acd621
rename and change aws backoff vars
Jun 8, 2019
cead166
fix volumecreate comments
Jun 8, 2019
52856b0
add sleep 5 before exponential backoff in waitUntilVolumeAvailable
Jun 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 12 additions & 7 deletions pkg/cloudprovider/providers/aws/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,12 +225,12 @@ const (
createTagFactor = 2.0
createTagSteps = 9

// encryptedCheck* is configuration of poll for created volume to check
// it has not been silently removed by AWS.
// volumeCreate* is configuration of exponential backoff for created volume.
// On a random AWS account (shared among several developers) it took 4s on
// average.
encryptedCheckInterval = 1 * time.Second
encryptedCheckTimeout = 30 * time.Second
// average, 8s max.
volumeCreateInitialDelay = 5 * time.Second
volumeCreateBackoffFactor = 1.2
volumeCreateBackoffSteps = 10

// Number of node names that can be added to a filter. The AWS limit is 200
// but we are using a lower limit on purpose
Expand Down Expand Up @@ -2424,8 +2424,13 @@ func (c *Cloud) waitUntilVolumeAvailable(volumeName KubernetesVolumeID) error {
// Unreachable code
return err
}

err = wait.Poll(encryptedCheckInterval, encryptedCheckTimeout, func() (done bool, err error) {
time.Sleep(5 * time.Second)
backoff := wait.Backoff{
Duration: volumeCreateInitialDelay,
Factor: volumeCreateBackoffFactor,
Steps: volumeCreateBackoffSteps,
}
err = wait.ExponentialBackoff(backoff, func() (done bool, err error) {
vol, err := disk.describeVolume()
if err != nil {
return true, err
Expand Down