-
Notifications
You must be signed in to change notification settings - Fork 9.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
aws: undeprecate min_elb_capacity; restore min capacity waiting
It was a mistake to switched fully to `==` when activating waiting for capacity on updates in #3947. Users that didn't set `min_elb_capacity == desired_capacity` and instead treated it as an actual "minimum" would see timeouts for every create, since their target numbers would never be reached exactly. Here, we fix that regression by restoring the minimum waiting behavior during creates. In order to preserve all the stated behavior, I had to split out different criteria for create and update, criteria which are now exhaustively unit tested. The set of fields that affect capacity waiting behavior has become a bit of a mess. Next major release I'd like to rework all of these into a more consistently named block of config. For now, just getting the behavior correct and documented. (Also removes all the fixed names from the ASG tests as I was hitting collision issues running them over here.) Fixes #4792
- Loading branch information
Showing
6 changed files
with
395 additions
and
109 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
129 changes: 129 additions & 0 deletions
129
builtin/providers/aws/resource_aws_autoscaling_group_waiting.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| package aws | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "log" | ||
| "strings" | ||
| "time" | ||
|
|
||
| "github.com/hashicorp/terraform/helper/resource" | ||
| "github.com/hashicorp/terraform/helper/schema" | ||
| ) | ||
|
|
||
| // waitForASGCapacityTimeout gathers the current numbers of healthy instances | ||
| // in the ASG and its attached ELBs and yields these numbers to a | ||
| // capacitySatifiedFunction. Loops for up to wait_for_capacity_timeout until | ||
| // the capacitySatisfiedFunc returns true. | ||
| // | ||
| // See "Waiting for Capacity" in docs for more discussion of the feature. | ||
| func waitForASGCapacity( | ||
| d *schema.ResourceData, | ||
| meta interface{}, | ||
| satisfiedFunc capacitySatisfiedFunc) error { | ||
| wait, err := time.ParseDuration(d.Get("wait_for_capacity_timeout").(string)) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if wait == 0 { | ||
| log.Printf("[DEBUG] Capacity timeout set to 0, skipping capacity waiting.") | ||
| return nil | ||
| } | ||
|
|
||
| log.Printf("[DEBUG] Waiting on %s for capacity...", d.Id()) | ||
|
|
||
| return resource.Retry(wait, func() error { | ||
| g, err := getAwsAutoscalingGroup(d, meta) | ||
| if err != nil { | ||
| return resource.RetryError{Err: err} | ||
| } | ||
| if g == nil { | ||
| return nil | ||
| } | ||
| lbis, err := getLBInstanceStates(g, meta) | ||
| if err != nil { | ||
| return resource.RetryError{Err: err} | ||
| } | ||
|
|
||
| haveASG := 0 | ||
| haveELB := 0 | ||
|
|
||
| for _, i := range g.Instances { | ||
| if i.HealthStatus == nil || i.InstanceId == nil || i.LifecycleState == nil { | ||
| continue | ||
| } | ||
|
|
||
| if !strings.EqualFold(*i.HealthStatus, "Healthy") { | ||
| continue | ||
| } | ||
|
|
||
| if !strings.EqualFold(*i.LifecycleState, "InService") { | ||
| continue | ||
| } | ||
|
|
||
| haveASG++ | ||
|
|
||
| inAllLbs := true | ||
| for _, states := range lbis { | ||
| state, ok := states[*i.InstanceId] | ||
| if !ok || !strings.EqualFold(state, "InService") { | ||
| inAllLbs = false | ||
| } | ||
| } | ||
| if inAllLbs { | ||
| haveELB++ | ||
| } | ||
| } | ||
|
|
||
| satisfied, reason := satisfiedFunc(d, haveASG, haveELB) | ||
|
|
||
| log.Printf("[DEBUG] %q Capacity: %d ASG, %d ELB, satisfied: %t, reason: %q", | ||
| d.Id(), haveASG, haveELB, satisfied, reason) | ||
|
|
||
| if satisfied { | ||
| return nil | ||
| } | ||
|
|
||
| return fmt.Errorf("%q: Waiting up to %s: %s", d.Id(), wait, reason) | ||
| }) | ||
| } | ||
|
|
||
| type capacitySatisfiedFunc func(*schema.ResourceData, int, int) (bool, string) | ||
|
|
||
| // capacitySatifiedCreate treats all targets as minimums | ||
| func capacitySatifiedCreate(d *schema.ResourceData, haveASG, haveELB int) (bool, string) { | ||
| minASG := d.Get("min_size").(int) | ||
| if wantASG := d.Get("desired_capacity").(int); wantASG > 0 { | ||
| minASG = wantASG | ||
| } | ||
| if haveASG < minASG { | ||
| return false, fmt.Sprintf( | ||
| "Need at least %d healthy instances in ASG, have %d", minASG, haveASG) | ||
| } | ||
| minELB := d.Get("min_elb_capacity").(int) | ||
| if wantELB := d.Get("wait_for_elb_capacity").(int); wantELB > 0 { | ||
| minELB = wantELB | ||
| } | ||
| if haveELB < minELB { | ||
| return false, fmt.Sprintf( | ||
| "Need at least %d healthy instances in ELB, have %d", minELB, haveELB) | ||
| } | ||
| return true, "" | ||
| } | ||
|
|
||
| // capacitySatifiedUpdate only cares about specific targets | ||
| func capacitySatifiedUpdate(d *schema.ResourceData, haveASG, haveELB int) (bool, string) { | ||
| if wantASG := d.Get("desired_capacity").(int); wantASG > 0 { | ||
| if haveASG != wantASG { | ||
| return false, fmt.Sprintf( | ||
| "Need exactly %d healthy instances in ASG, have %d", wantASG, haveASG) | ||
| } | ||
| } | ||
| if wantELB := d.Get("wait_for_elb_capacity").(int); wantELB > 0 { | ||
| if haveELB != wantELB { | ||
| return false, fmt.Sprintf( | ||
| "Need exactly %d healthy instances in ELB, have %d", wantELB, haveELB) | ||
| } | ||
| } | ||
| return true, "" | ||
| } |
Oops, something went wrong.