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

Jump to bottom

Fixing deadlock in subnet resources #3673

Merged
merged 5 commits into from
Aug 23, 2019
Merged

Fixing deadlock in subnet resources #3673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6f893b3
Switching vnet locks to subnet locks
Moeser May 8, 2019
a025e77
Removing superfluous locks from azurerm_subnet_* resources
Moeser May 9, 2019
9a06fe5
Removing parseRouteTableName since it's not referenced anymore.
Moeser May 9, 2019
f4ab40f
fixing a merge conflict
tombuildsstuff Aug 22, 2019
e4b830f
fix linting
katbyte Aug 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 0 additions & 9 deletions azurerm/networking.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,6 @@ func parseNetworkSecurityGroupName(networkSecurityGroupId string) (string, error
return id.Path["networkSecurityGroups"], nil
}

func parseRouteTableName(routeTableId string) (string, error) {
id, err := azure.ParseAzureResourceID(routeTableId)
if err != nil {
return "", fmt.Errorf("[ERROR] Unable to parse Route Table ID '%s': %+v", routeTableId, err)
}

return id.Path["routeTables"], nil
}

func retrieveErcByResourceId(resourceId string, meta interface{}) (erc *network.ExpressRouteCircuit, resourceGroup string, e error) {
ercClient := meta.(*ArmClient).network.ExpressRouteCircuitsClient
ctx := meta.(*ArmClient).StopContext
Expand Down
45 changes: 2 additions & 43 deletions azurerm/resource_arm_subnet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ func resourceArmSubnetCreateUpdate(d *schema.ResourceData, meta interface{}) err

addressPrefix := d.Get("address_prefix").(string)

locks.ByName(vnetName, virtualNetworkResourceName)
defer locks.UnlockByName(vnetName, virtualNetworkResourceName)
locks.ByName(name, subnetResourceName)
defer locks.UnlockByName(name, subnetResourceName)

properties := network.SubnetPropertiesFormat{
AddressPrefix: &addressPrefix,
Expand All @@ -162,14 +162,6 @@ func resourceArmSubnetCreateUpdate(d *schema.ResourceData, meta interface{}) err
properties.NetworkSecurityGroup = &network.SecurityGroup{
ID: &nsgId,
}

networkSecurityGroupName, err := parseNetworkSecurityGroupName(nsgId)
if err != nil {
return err
}

locks.ByName(networkSecurityGroupName, networkSecurityGroupResourceName)
defer locks.UnlockByName(networkSecurityGroupName, networkSecurityGroupResourceName)
} else {
properties.NetworkSecurityGroup = nil
}
Expand All @@ -179,14 +171,6 @@ func resourceArmSubnetCreateUpdate(d *schema.ResourceData, meta interface{}) err
properties.RouteTable = &network.RouteTable{
ID: &rtId,
}

routeTableName, err := parseRouteTableName(rtId)
if err != nil {
return err
}

locks.ByName(routeTableName, routeTableResourceName)
defer locks.UnlockByName(routeTableName, routeTableResourceName)
} else {
properties.RouteTable = nil
}
Expand Down Expand Up @@ -296,31 +280,6 @@ func resourceArmSubnetDelete(d *schema.ResourceData, meta interface{}) error {
name := id.Path["subnets"]
vnetName := id.Path["virtualNetworks"]

if v, ok := d.GetOk("network_security_group_id"); ok {
networkSecurityGroupId := v.(string)
networkSecurityGroupName, err2 := parseNetworkSecurityGroupName(networkSecurityGroupId)
if err2 != nil {
return err2
}

locks.ByName(networkSecurityGroupName, networkSecurityGroupResourceName)
defer locks.UnlockByName(networkSecurityGroupName, networkSecurityGroupResourceName)
}

if v, ok := d.GetOk("route_table_id"); ok {
rtId := v.(string)
routeTableName, err2 := parseRouteTableName(rtId)
if err2 != nil {
return err2
}

locks.ByName(routeTableName, routeTableResourceName)
defer locks.UnlockByName(routeTableName, routeTableResourceName)
}

locks.ByName(vnetName, virtualNetworkResourceName)
defer locks.UnlockByName(vnetName, virtualNetworkResourceName)

locks.ByName(name, subnetResourceName)
defer locks.UnlockByName(name, subnetResourceName)

Expand Down
24 changes: 2 additions & 22 deletions azurerm/resource_arm_subnet_network_security_group_association.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,12 @@ func resourceArmSubnetNetworkSecurityGroupAssociationCreate(d *schema.ResourceDa
return err
}

networkSecurityGroupName, err := parseNetworkSecurityGroupName(networkSecurityGroupId)
if err != nil {
return err
}

locks.ByName(networkSecurityGroupName, networkSecurityGroupResourceName)
defer locks.UnlockByName(networkSecurityGroupName, networkSecurityGroupResourceName)

subnetName := parsedSubnetId.Path["subnets"]
virtualNetworkName := parsedSubnetId.Path["virtualNetworks"]
resourceGroup := parsedSubnetId.ResourceGroup

locks.ByName(virtualNetworkName, virtualNetworkResourceName)
defer locks.UnlockByName(virtualNetworkName, virtualNetworkResourceName)
locks.ByName(subnetName, subnetResourceName)
defer locks.UnlockByName(subnetName, subnetResourceName)

subnet, err := client.Get(ctx, resourceGroup, virtualNetworkName, subnetName, "")
if err != nil {
Expand Down Expand Up @@ -185,18 +177,6 @@ func resourceArmSubnetNetworkSecurityGroupAssociationDelete(d *schema.ResourceDa
return nil
}

// once we have the network security group id to lock on, lock on that
networkSecurityGroupName, err := parseNetworkSecurityGroupName(*props.NetworkSecurityGroup.ID)
if err != nil {
return err
}

locks.ByName(networkSecurityGroupName, networkSecurityGroupResourceName)
defer locks.UnlockByName(networkSecurityGroupName, networkSecurityGroupResourceName)

locks.ByName(virtualNetworkName, virtualNetworkResourceName)
defer locks.UnlockByName(virtualNetworkName, virtualNetworkResourceName)

locks.ByName(subnetName, subnetResourceName)
defer locks.UnlockByName(subnetName, subnetResourceName)

Expand Down
28 changes: 4 additions & 24 deletions azurerm/resource_arm_subnet_route_table_association.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,12 @@ func resourceArmSubnetRouteTableAssociationCreate(d *schema.ResourceData, meta i
return err
}

routeTableName, err := parseRouteTableName(routeTableId)
if err != nil {
return err
}

locks.ByName(routeTableName, routeTableResourceName)
defer locks.UnlockByName(routeTableName, routeTableResourceName)

subnetName := parsedSubnetId.Path["subnets"]
virtualNetworkName := parsedSubnetId.Path["virtualNetworks"]
resourceGroup := parsedSubnetId.ResourceGroup

locks.ByName(virtualNetworkName, virtualNetworkResourceName)
defer locks.UnlockByName(virtualNetworkName, virtualNetworkResourceName)
locks.ByName(subnetName, subnetResourceName)
defer locks.UnlockByName(subnetName, subnetResourceName)

subnet, err := client.Get(ctx, resourceGroup, virtualNetworkName, subnetName, "")
if err != nil {
Expand Down Expand Up @@ -185,20 +177,8 @@ func resourceArmSubnetRouteTableAssociationDelete(d *schema.ResourceData, meta i
return nil
}

// once we have the route table id to lock on, lock on that
routeTableName, err := parseRouteTableName(*props.RouteTable.ID)
if err != nil {
return err
}

locks.ByName(routeTableName, routeTableResourceName)
defer locks.UnlockByName(routeTableName, routeTableResourceName)

locks.ByName(virtualNetworkName, virtualNetworkResourceName)
defer locks.UnlockByName(virtualNetworkName, virtualNetworkResourceName)

locks.ByName(subnetName, subnetResourceName)
defer locks.UnlockByName(subnetName, subnetResourceName)
azureRMLockByName(subnetName, subnetResourceName)
defer azureRMUnlockByName(subnetName, subnetResourceName)

// then re-retrieve it to ensure we've got the latest state
read, err = client.Get(ctx, resourceGroup, virtualNetworkName, subnetName, "")
Expand Down