Fix google_dns_record_set with same name throw an error (GoogleCloudPlatform#11622)

Author: Samir-Cit

mmv1/third_party/terraform/services/dns/resource_dns_record_set.go

@@ -375,6 +375,14 @@ func resourceDnsRecordSetCreate(d *schema.ResourceData, meta interface{}) error
 		chg.Deletions = deletions
 	}
 
+	// Mutex
+	lockName := fmt.Sprintf("projects/%s/managedZones/%s/rrsets/%s/%s", project, zone, name, rType)
+	if err != nil {
+		return err
+	}
+	transport_tpg.MutexStore.Lock(lockName)
+	defer transport_tpg.MutexStore.Unlock(lockName)
+
 	log.Printf("[DEBUG] DNS Record create request: %#v", chg)
 	chg, err = config.NewDnsClient(userAgent).Changes.Create(project, zone, chg).Do()
 	if err != nil {
@@ -468,7 +476,9 @@ func resourceDnsRecordSetDelete(d *schema.ResourceData, meta interface{}) error
 		return err
 	}
 
+	name := d.Get("name").(string)
 	zone := d.Get("managed_zone").(string)
+	rType := d.Get("type").(string)
 
 	// NS and SOA records on the root zone must always have a value,
 	// so we short-circuit delete this allows terraform delete to work,
@@ -511,6 +521,14 @@ func resourceDnsRecordSetDelete(d *schema.ResourceData, meta interface{}) error
 		},
 	}
 
+	// Mutex
+	lockName := fmt.Sprintf("projects/%s/managedZones/%s/rrsets/%s/%s", project, zone, name, rType)
+	if err != nil {
+		return err
+	}
+	transport_tpg.MutexStore.Lock(lockName)
+	defer transport_tpg.MutexStore.Unlock(lockName)
+
 	log.Printf("[DEBUG] DNS Record delete request: %#v", chg)
 	chg, err = config.NewDnsClient(userAgent).Changes.Create(project, zone, chg).Do()
 	if err != nil {