From 798475f67de42cc5dfe2977ecd701b319d8bc9fc Mon Sep 17 00:00:00 2001 From: Cameron Stokes Date: Fri, 22 Apr 2016 08:02:16 -0700 Subject: [PATCH 1/2] provider/aws: increase timeout for aws_redshift_cluster --- builtin/providers/aws/resource_aws_redshift_cluster.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/providers/aws/resource_aws_redshift_cluster.go b/builtin/providers/aws/resource_aws_redshift_cluster.go index f648a95ebf12..f4252cd96493 100644 --- a/builtin/providers/aws/resource_aws_redshift_cluster.go +++ b/builtin/providers/aws/resource_aws_redshift_cluster.go @@ -265,8 +265,8 @@ func resourceAwsRedshiftClusterCreate(d *schema.ResourceData, meta interface{}) Pending: []string{"creating", "backing-up", "modifying"}, Target: []string{"available"}, Refresh: resourceAwsRedshiftClusterStateRefreshFunc(d, meta), - Timeout: 5 * time.Minute, - MinTimeout: 3 * time.Second, + Timeout: 40 * time.Minute, + MinTimeout: 10 * time.Second, } _, err = stateConf.WaitForState() From b2b7d7331fdbd7b00b07aaaae558f283fb7db245 Mon Sep 17 00:00:00 2001 From: Cameron Stokes Date: Fri, 22 Apr 2016 08:23:22 -0700 Subject: [PATCH 2/2] provider/aws: increase timeout for redshift updates too --- builtin/providers/aws/resource_aws_redshift_cluster.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/providers/aws/resource_aws_redshift_cluster.go b/builtin/providers/aws/resource_aws_redshift_cluster.go index f4252cd96493..baab8f19f748 100644 --- a/builtin/providers/aws/resource_aws_redshift_cluster.go +++ b/builtin/providers/aws/resource_aws_redshift_cluster.go @@ -424,8 +424,8 @@ func resourceAwsRedshiftClusterUpdate(d *schema.ResourceData, meta interface{}) Pending: []string{"creating", "deleting", "rebooting", "resizing", "renaming", "modifying"}, Target: []string{"available"}, Refresh: resourceAwsRedshiftClusterStateRefreshFunc(d, meta), - Timeout: 10 * time.Minute, - MinTimeout: 5 * time.Second, + Timeout: 40 * time.Minute, + MinTimeout: 10 * time.Second, } // Wait, catching any errors