public/terraform-provider-google
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-google.git synced 2024-07-03 08:42:39 +00:00
Code Issues Projects Releases Wiki Activity

Fix the database sweeper.

Browse Source 
It's getting hung up on a database replica instance that's not running,
so it can't stop it.

To resolve, we're only trying to stop replica instances that are in a
running state. Also, I noticed a bug that we'd try to delete replicas
twice, so I fixed that, as well.
This commit is contained in:
Paddy 2017-12-06 11:56:17 -08:00
parent 54ea8bb732
commit 4f9687e457
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
google/resource_sql_database_instance_test.go
View File

@ -49,6 +49,8 @@ func testSweepDatabases(region string) error {
return nil
}
running := map[string]struct{}{}
for _, d := range found.Items {
var testDbInstance bool
for _, testName := range []string{"tf-lw-", "sqldatabasetest"} {
@ -61,7 +63,15 @@ func testSweepDatabases(region string) error {
if !testDbInstance {
continue
}
running[d.Name] = struct{}{}
}
for _, d := range found.Items {
// don't delete replicas, we'll take care of that
// when deleting the database they replicate
if d.ReplicaConfiguration != nil {
continue
}
log.Printf("Destroying SQL Instance (%s)", d.Name)
// replicas need to be stopped and destroyed before destroying a master
@ -69,6 +79,12 @@ func testSweepDatabases(region string) error {
// and we call destroy on them before destroying the master
var ordering []string
for _, replicaName := range d.ReplicaNames {
// don't try to stop replicas that aren't running
if _, ok := running[replicaName]; !ok {
ordering = append(ordering, replicaName)
continue
}
// need to stop replication before being able to destroy a database
op, err := config.clientSqlAdmin.Instances.StopReplica(config.Project, replicaName).Do()