Skip to content

Bug 1810470: carry: Check for optimizing state too #167

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

Merged
openshift-merge-robot merged 1 commit into from
Sep 8, 2020
Merged

Bug 1810470: carry: Check for optimizing state too #167

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions pkg/cloud/cloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -885,7 +885,7 @@ func (c *cloud) ResizeDisk(ctx context.Context, volumeID string, newSizeBytes in
if latestMod != nil {
state := aws.StringValue(latestMod.ModificationState)
targetSize := aws.Int64Value(latestMod.TargetSize)
if (state == ec2.VolumeModificationStateCompleted) && (targetSize >= newSizeGiB) {
if volumeModificationDone(state) && (targetSize >= newSizeGiB) {
modificationDone = true
}
}
Expand Down Expand Up @@ -925,7 +925,7 @@ func (c *cloud) ResizeDisk(ctx context.Context, volumeID string, newSizeBytes in
}

state := aws.StringValue(mod.ModificationState)
if state == ec2.VolumeModificationStateCompleted {
if volumeModificationDone(state) {
return c.checkDesiredSize(ctx, volumeID, newSizeGiB)
}

Expand Down Expand Up @@ -964,8 +964,8 @@ func (c *cloud) waitForVolumeSize(ctx context.Context, volumeID string) (int64,
// the default context is 10s and hence we should reduce this to more reasonable value and let external-resizer retry
backoff := wait.Backoff{
Duration: 1 * time.Second,
Factor: 1.8,
Steps: 3,
Factor: 1.7,
Steps: 10,
}

var modVolSizeGiB int64
Expand All @@ -977,7 +977,7 @@ func (c *cloud) waitForVolumeSize(ctx context.Context, volumeID string) (int64,

state := aws.StringValue(m.ModificationState)
klog.Infof("volume %q is being modified to %d size and is in %s state", volumeID, aws.Int64Value(m.TargetSize), state)
if state == ec2.VolumeModificationStateCompleted {
if volumeModificationDone(state) {
modVolSizeGiB = aws.Int64Value(m.TargetSize)
return true, nil
}
Expand Down Expand Up @@ -1031,3 +1031,10 @@ func (c *cloud) randomAvailabilityZone(ctx context.Context) (string, error) {

return zones[0], nil
}

func volumeModificationDone(state string) bool {
if state == ec2.VolumeModificationStateCompleted || state == ec2.VolumeModificationStateOptimizing {
return true
}
return false
}