Mutex change

CHANGELOG.md

@@ -17,7 +17,7 @@ FEATURES:
 * `vcd_vapp_vm` - Ability to add metadata to a VM. For previous behaviour please see `BACKWARDS INCOMPATIBILITIES` ([#158](https://github.com/terraform-providers/terraform-provider-vcd/issues/158))
 * `vcd_vapp_vm` - Ability to enable hardware assisted CPU virtualization for VM. It allows hypervisor nesting. ([#219](https://github.com/terraform-providers/terraform-provider-vcd/issues/219))
 * **New Resource:** external network - `vcd_external_network` - ([#230](https://github.com/terraform-providers/terraform-provider-vcd/issues/230))
-* **New Resource:** VDC resource `vcd_org_vdc` - ([#234](https://github.com/terraform-providers/terraform-provider-vcd/issues/234))
+* **New Resource:** VDC resource `vcd_org_vdc` - ([#236](https://github.com/terraform-providers/terraform-provider-vcd/issues/236))
 * resource/vcd_vapp_vm: Add `network` argument for multiple NIC support and more flexible configuration ([#233](https://github.com/terraform-providers/terraform-provider-vcd/issues/233))
 * resource/vcd_vapp_vm: Add `mac` argument to store MAC address in state file ([#233](https://github.com/terraform-providers/terraform-provider-vcd/issues/233))
 

vcd/provider.go

@@ -1,6 +1,7 @@
 package vcd
 
 import (
+	"github.com/hashicorp/terraform/helper/mutexkv"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/terraform"
 	"github.com/vmware/go-vcloud-director/v2/util"
@@ -108,6 +109,33 @@ func Provider() terraform.ResourceProvider {
 	}
 }
 
+// This is a global MutexKV for all resources
+var vcdMutexKV = mutexkv.NewMutexKV()
+
+func lockVapp(d *schema.ResourceData) {
+	vcdMutexKV.Lock(d.Get("vdc").(string) + d.Get("name").(string))
+}
+
+func unLockVapp(d *schema.ResourceData) {
+	vcdMutexKV.Unlock(d.Get("vdc").(string) + d.Get("name").(string))
+}
+
+func lockParentVapp(d *schema.ResourceData) {
+	vcdMutexKV.Lock(d.Get("vdc").(string) + d.Get("vapp_name").(string))
+}
+
+func unLockParentVapp(d *schema.ResourceData) {
+	vcdMutexKV.Unlock(d.Get("vdc").(string) + d.Get("vapp_name").(string))
+}
+
+func lockParentEdgeGtw(d *schema.ResourceData) {
+	vcdMutexKV.Lock(d.Get("vdc").(string) + d.Get("edge_gateway").(string))
+}
+
+func unLockParentEdgeGtw(d *schema.ResourceData) {
+	vcdMutexKV.Unlock(d.Get("vdc").(string) + d.Get("edge_gateway").(string))
+}
+
 func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 	maxRetryTimeout := d.Get("max_retry_timeout").(int)
 

vcd/resource_vcd_dnat.go

@@ -5,7 +5,6 @@ import (
 	"log"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
 	"github.com/vmware/go-vcloud-director/v2/types/v56"
@@ -90,8 +89,9 @@ func resourceVcdDNATCreate(d *schema.ResourceData, meta interface{}) error {
 	// Multiple VCD components need to run operations on the Edge Gateway, as
 	// the edge gateway will throw back an error if it is already performing an
 	// operation we must wait until we can acquire a lock on the client
-	vcdClient.Mutex.Lock()
-	defer vcdClient.Mutex.Unlock()
+	lockParentEdgeGtw(d)
+	defer unLockParentEdgeGtw(d)
+
 	portString := getPortString(d.Get("port").(int))
 	translatedPortString := portString // default
 	if d.Get("translated_port").(int) > 0 {
@@ -128,36 +128,30 @@ func resourceVcdDNATCreate(d *schema.ResourceData, meta interface{}) error {
 	// 3 seconds and then try again. Continue until a non-busy error or success
 
 	if nil != providedNetworkName && providedNetworkName != "" {
-		err = retryCall(vcdClient.MaxRetryTimeout, func() *resource.RetryError {
-			task, err := edgeGateway.AddNATPortMappingWithUplink(orgVdcnetwork, "DNAT",
-				d.Get("external_ip").(string),
-				portString,
-				d.Get("internal_ip").(string),
-				translatedPortString, protocol,
-				icmpSubType)
-			if err != nil {
-				return resource.RetryableError(
-					fmt.Errorf("error setting DNAT rules: %#v", err))
-			}
+		task, err := edgeGateway.AddNATPortMappingWithUplink(orgVdcnetwork, "DNAT",
+			d.Get("external_ip").(string),
+			portString,
+			d.Get("internal_ip").(string),
+			translatedPortString, protocol,
+			icmpSubType)
+		if err != nil {
+			return fmt.Errorf("error setting DNAT rules: %#v", err)
+		}
 
-			return resource.RetryableError(task.WaitTaskCompletion())
-		})
+		err = task.WaitTaskCompletion()
 	} else {
 		// TODO remove when major release is done
-		err = retryCall(vcdClient.MaxRetryTimeout, func() *resource.RetryError {
-			task, err := edgeGateway.AddNATPortMapping("DNAT",
-				d.Get("external_ip").(string),
-				portString,
-				d.Get("internal_ip").(string),
-				translatedPortString, protocol,
-				icmpSubType)
-			if err != nil {
-				return resource.RetryableError(
-					fmt.Errorf("error setting DNAT rules: %#v", err))
-			}
+		task, err := edgeGateway.AddNATPortMapping("DNAT",
+			d.Get("external_ip").(string),
+			portString,
+			d.Get("internal_ip").(string),
+			translatedPortString, protocol,
+			icmpSubType)
+		if err != nil {
+			return fmt.Errorf("error setting DNAT rules: %#v", err)
+		}
 
-			return resource.RetryableError(task.WaitTaskCompletion())
-		})
+		err = task.WaitTaskCompletion()
 	}
 
 	if err != nil {
@@ -218,8 +212,9 @@ func resourceVcdDNATDelete(d *schema.ResourceData, meta interface{}) error {
 	// Multiple VCD components need to run operations on the Edge Gateway, as
 	// the edge gatway will throw back an error if it is already performing an
 	// operation we must wait until we can aquire a lock on the client
-	vcdClient.Mutex.Lock()
-	defer vcdClient.Mutex.Unlock()
+	lockParentEdgeGtw(d)
+	defer unLockParentEdgeGtw(d)
+
 	portString := getPortString(d.Get("port").(int))
 	translatedPortString := portString // default
 	if d.Get("translated_port").(int) > 0 {
@@ -231,19 +226,16 @@ func resourceVcdDNATDelete(d *schema.ResourceData, meta interface{}) error {
 	if err != nil {
 		return fmt.Errorf(errorUnableToFindEdgeGateway, err)
 	}
-	err = retryCall(vcdClient.MaxRetryTimeout, func() *resource.RetryError {
-		task, err := edgeGateway.RemoveNATPortMapping("DNAT",
-			d.Get("external_ip").(string),
-			portString,
-			d.Get("internal_ip").(string),
-			translatedPortString)
-		if err != nil {
-			return resource.RetryableError(
-				fmt.Errorf("error setting DNAT rules: %#v", err))
-		}
+	task, err := edgeGateway.RemoveNATPortMapping("DNAT",
+		d.Get("external_ip").(string),
+		portString,
+		d.Get("internal_ip").(string),
+		translatedPortString)
+	if err != nil {
+		return fmt.Errorf("error setting DNAT rules: %#v", err)
+	}
 
-		return resource.RetryableError(task.WaitTaskCompletion())
-	})
+	err = task.WaitTaskCompletion()
 	if err != nil {
 		return fmt.Errorf("error completing tasks: %#v", err)
 	}

vcd/resource_vcd_edgegateway_vpn.go

@@ -5,7 +5,6 @@ import (
 	"log"
 	"strconv"
 
-	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/vmware/go-vcloud-director/v2/types/v56"
 )
@@ -142,8 +141,8 @@ func resourceVcdEdgeGatewayVpnCreate(d *schema.ResourceData, meta interface{}) e
 	vcdClient := meta.(*VCDClient)
 	log.Printf("[TRACE] CLIENT: %#v", vcdClient)
 
-	vcdClient.Mutex.Lock()
-	defer vcdClient.Mutex.Unlock()
+	lockParentEdgeGtw(d)
+	defer unLockParentEdgeGtw(d)
 
 	edgeGateway, err := vcdClient.GetEdgeGatewayFromResource(d)
 	if err != nil {
@@ -206,22 +205,18 @@ func resourceVcdEdgeGatewayVpnCreate(d *schema.ResourceData, meta interface{}) e
 
 	log.Printf("[INFO] ipsecVPNConfig: %#v", ipsecVPNConfig)
 
-	err = retryCall(vcdClient.MaxRetryTimeout, func() *resource.RetryError {
-		err := edgeGateway.Refresh()
-		if err != nil {
-			log.Printf("[INFO] Error refreshing edge gateway: %#v", err)
-			return resource.RetryableError(
-				fmt.Errorf("error error refreshing edge gateway: %#v", err))
-		}
-		task, err := edgeGateway.AddIpsecVPN(ipsecVPNConfig)
-		if err != nil {
-			log.Printf("[INFO] Error setting ipsecVPNConfig rules: %s", err)
-			return resource.RetryableError(
-				fmt.Errorf("error setting ipsecVPNConfig rules: %#v", err))
-		}
+	err = edgeGateway.Refresh()
+	if err != nil {
+		log.Printf("[INFO] Error refreshing edge gateway: %#v", err)
+		return fmt.Errorf("error error refreshing edge gateway: %#v", err)
+	}
+	task, err := edgeGateway.AddIpsecVPN(ipsecVPNConfig)
+	if err != nil {
+		log.Printf("[INFO] Error setting ipsecVPNConfig rules: %s", err)
+		return fmt.Errorf("error setting ipsecVPNConfig rules: %#v", err)
+	}
 
-		return resource.RetryableError(task.WaitTaskCompletion())
-	})
+	err = task.WaitTaskCompletion()
 	if err != nil {
 		return fmt.Errorf(errorCompletingTask, err)
 	}
@@ -236,8 +231,8 @@ func resourceVcdEdgeGatewayVpnDelete(d *schema.ResourceData, meta interface{}) e
 
 	log.Printf("[TRACE] CLIENT: %#v", vcdClient)
 
-	vcdClient.Mutex.Lock()
-	defer vcdClient.Mutex.Unlock()
+	lockParentEdgeGtw(d)
+	defer unLockParentEdgeGtw(d)
 
 	edgeGateway, err := vcdClient.GetEdgeGatewayFromResource(d)
 	if err != nil {
@@ -253,22 +248,18 @@ func resourceVcdEdgeGatewayVpnDelete(d *schema.ResourceData, meta interface{}) e
 
 	log.Printf("[INFO] ipsecVPNConfig: %#v", ipsecVPNConfig)
 
-	err = retryCall(vcdClient.MaxRetryTimeout, func() *resource.RetryError {
-		err := edgeGateway.Refresh()
-		if err != nil {
-			log.Printf("[INFO] Error refreshing edge gateway: %#v", err)
-			return resource.RetryableError(
-				fmt.Errorf("error error refreshing edge gateway: %#v", err))
-		}
-		task, err := edgeGateway.AddIpsecVPN(ipsecVPNConfig)
-		if err != nil {
-			log.Printf("[INFO] Error setting ipsecVPNConfig rules: %s", err)
-			return resource.RetryableError(
-				fmt.Errorf("error setting ipsecVPNConfig rules: %#v", err))
-		}
+	err = edgeGateway.Refresh()
+	if err != nil {
+		log.Printf("[INFO] Error refreshing edge gateway: %#v", err)
+		return fmt.Errorf("error error refreshing edge gateway: %#v", err)
+	}
+	task, err := edgeGateway.AddIpsecVPN(ipsecVPNConfig)
+	if err != nil {
+		log.Printf("[INFO] Error setting ipsecVPNConfig rules: %s", err)
+		return fmt.Errorf("error setting ipsecVPNConfig rules: %#v", err)
+	}
 
-		return resource.RetryableError(task.WaitTaskCompletion())
-	})
+	err = task.WaitTaskCompletion()
 	if err != nil {
 		return fmt.Errorf(errorCompletingTask, err)
 	}

vcd/resource_vcd_firewall_rules.go

@@ -5,7 +5,6 @@ import (
 	"log"
 	"strings"
 
-	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/vmware/go-vcloud-director/v2/types/v56"
 )
@@ -96,8 +95,8 @@ func resourceVcdFirewallRules() *schema.Resource {
 func resourceVcdFirewallRulesCreate(d *schema.ResourceData, meta interface{}) error {
 	vcdClient := meta.(*VCDClient)
 
-	vcdClient.Mutex.Lock()
-	defer vcdClient.Mutex.Unlock()
+	lockParentEdgeGtw(d)
+	defer unLockParentEdgeGtw(d)
 
 	edgeGatewayName := d.Get("edge_gateway").(string)
 
@@ -106,23 +105,19 @@ func resourceVcdFirewallRulesCreate(d *schema.ResourceData, meta interface{}) er
 		return fmt.Errorf(errorUnableToFindEdgeGateway, err)
 	}
 
-	err = retryCall(vcdClient.MaxRetryTimeout, func() *resource.RetryError {
-		err := edgeGateway.Refresh()
-		if err != nil {
-			log.Printf("[INFO] Error refreshing edge gateway: %#v", err)
-			return resource.RetryableError(
-				fmt.Errorf("error error refreshing edge gateway: %#v", err))
-		}
-		firewallRules, _ := expandFirewallRules(d, edgeGateway.EdgeGateway)
-		task, err := edgeGateway.CreateFirewallRules(d.Get("default_action").(string), firewallRules)
-		if err != nil {
-			log.Printf("[INFO] Error setting firewall rules: %s", err)
-			return resource.RetryableError(
-				fmt.Errorf("error setting firewall rules: %#v", err))
-		}
+	err = edgeGateway.Refresh()
+	if err != nil {
+		log.Printf("[INFO] Error refreshing edge gateway: %#v", err)
+		return fmt.Errorf("error error refreshing edge gateway: %#v", err)
+	}
+	firewallRules, _ := expandFirewallRules(d, edgeGateway.EdgeGateway)
+	task, err := edgeGateway.CreateFirewallRules(d.Get("default_action").(string), firewallRules)
+	if err != nil {
+		log.Printf("[INFO] Error setting firewall rules: %s", err)
+		return fmt.Errorf("error setting firewall rules: %#v", err)
+	}
 
-		return resource.RetryableError(task.WaitTaskCompletion())
-	})
+	err = task.WaitTaskCompletion()
 	if err != nil {
 		return fmt.Errorf(errorCompletingTask, err)
 	}
@@ -135,8 +130,8 @@ func resourceVcdFirewallRulesCreate(d *schema.ResourceData, meta interface{}) er
 func resourceFirewallRulesDelete(d *schema.ResourceData, meta interface{}) error {
 	vcdClient := meta.(*VCDClient)
 
-	vcdClient.Mutex.Lock()
-	defer vcdClient.Mutex.Unlock()
+	lockParentEdgeGtw(d)
+	defer unLockParentEdgeGtw(d)
 
 	edgeGateway, err := vcdClient.GetEdgeGatewayFromResource(d)
 	if err != nil {

vcd/resource_vcd_network_direct.go

@@ -3,7 +3,6 @@ package vcd
 import (
 	"fmt"
 
-	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/vmware/go-vcloud-director/v2/govcd"
 	"github.com/vmware/go-vcloud-director/v2/types/v56"
@@ -57,8 +56,6 @@ func resourceVcdNetworkDirect() *schema.Resource {
 
 func resourceVcdNetworkDirectCreate(d *schema.ResourceData, meta interface{}) error {
 	vcdClient := meta.(*VCDClient)
-	vcdClient.Mutex.Lock()
-	defer vcdClient.Mutex.Unlock()
 
 	_, vdc, err := vcdClient.GetOrgAndVdcFromResource(d)
 	if err != nil {
@@ -93,9 +90,7 @@ func resourceVcdNetworkDirectCreate(d *schema.ResourceData, meta interface{}) er
 		IsShared: d.Get("shared").(bool),
 	}
 
-	err = retryCall(vcdClient.MaxRetryTimeout, func() *resource.RetryError {
-		return resource.RetryableError(vdc.CreateOrgVDCNetworkWait(orgVDCNetwork))
-	})
+	err = vdc.CreateOrgVDCNetworkWait(orgVDCNetwork)
 	if err != nil {
 		return fmt.Errorf("error: %#v", err)
 	}

vcd/resource_vcd_network_isolated.go

@@ -3,7 +3,6 @@ package vcd
 import (
 	"fmt"
 
-	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/vmware/go-vcloud-director/v2/types/v56"
 )
@@ -135,8 +134,6 @@ func resourceVcdNetworkIsolated() *schema.Resource {
 
 func resourceVcdNetworkIsolatedCreate(d *schema.ResourceData, meta interface{}) error {
 	vcdClient := meta.(*VCDClient)
-	vcdClient.Mutex.Lock()
-	defer vcdClient.Mutex.Unlock()
 
 	_, vdc, err := vcdClient.GetOrgAndVdcFromResource(d)
 	if err != nil {
@@ -172,9 +169,7 @@ func resourceVcdNetworkIsolatedCreate(d *schema.ResourceData, meta interface{})
 		IsShared: d.Get("shared").(bool),
 	}
 
-	err = retryCall(vcdClient.MaxRetryTimeout, func() *resource.RetryError {
-		return resource.RetryableError(vdc.CreateOrgVDCNetworkWait(orgVDCNetwork))
-	})
+	err = vdc.CreateOrgVDCNetworkWait(orgVDCNetwork)
 	if err != nil {
 		return fmt.Errorf("error: %#v", err)
 	}