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

resource/aws_elasticsearch_domain: Ensure in-place version upgrade is fully successful before returning #11793

Merged
merged 1 commit into from
Jan 30, 2020
Merged

resource/aws_elasticsearch_domain: Ensure in-place version upgrade is fully successful before returning #11793

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
7 changes: 7 additions & 0 deletions aws/resource_aws_elasticsearch_domain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,6 +834,13 @@ func resourceAwsElasticSearchDomainUpdate(d *schema.ResourceData, meta interface
return nil, "", err
}

// Elasticsearch upgrades consist of multiple steps:
// https://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-version-migration.html
// Prevent false positive completion where the UpgradeStep is not the final UPGRADE step.
if aws.StringValue(out.StepStatus) == elasticsearch.UpgradeStatusSucceeded && aws.StringValue(out.UpgradeStep) != elasticsearch.UpgradeStepUpgrade {
return out, elasticsearch.UpgradeStatusInProgress, nil
}

return out, aws.StringValue(out.StepStatus), nil
},
Timeout: 60 * time.Minute, // TODO: Make this configurable. Large ES domains may take a very long time to upgrade
Expand Down