Skip to content

remove deleting network adapter when no endpoints #883

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

Merged
merged 2 commits into from
Jun 15, 2021
Merged

remove deleting network adapter when no endpoints #883

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70b8295
remove deleting network adapter when no endpoints
aegal May 27, 2021
7a32603
update feedback
aegal Jun 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 20 additions & 23 deletions cns/hnsclient/hnsclient_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,8 @@ func createHostNCApipaNetwork(
},
GatewayIPAddress: localIPConfiguration.GatewayIPAddress,
}
logger.Printf("Print interfaces before creating loopback adapter")
LogNetworkInterfaces()

if err = networkcontainers.CreateLoopbackAdapter(
hostNCLoopbackAdapterName,
Expand All @@ -312,6 +314,9 @@ func createHostNCApipaNetwork(
"" /* Empty primary Interface Identifier as setWeakHostOnInterface is not needed*/); err != nil {
return nil, fmt.Errorf("Failed to create loopback adapter. Error: %v", err)
}

logger.Printf("Print interfaces after creating loopback adapter")
LogNetworkInterfaces()
}

// Create the HNS network.
Expand All @@ -329,6 +334,20 @@ func createHostNCApipaNetwork(
return network, err
}

// LogNetworkInterfaces logs the host's network interfaces in the default namespace.
func LogNetworkInterfaces() {
interfaces, err := net.Interfaces()
if err != nil {
logger.Printf("Failed to query network interfaces, err:%v", err)
return
}

for _, iface := range interfaces {
addrs, _ := iface.Addrs()
logger.Printf("Network interface: %+v with IP: %+v", iface, addrs)
}
}

func addAclToEndpointPolicy(
aclPolicySetting hcn.AclPolicySetting,
endpointPolicies *[]hcn.EndpointPolicy) error {
Expand Down Expand Up @@ -667,27 +686,5 @@ func DeleteHostNCApipaEndpoint(

logger.Debugf("[Azure CNS] Successfully deleted HostNCApipaEndpoint: %s", endpointName)

namedLock.LockAcquire(hostNCApipaNetworkName)
defer namedLock.LockRelease(hostNCApipaNetworkName)

// Check if hostNCApipaNetworkName has any endpoints left
if network, err := hcn.GetNetworkByName(hostNCApipaNetworkName); err == nil {
var endpoints []hcn.HostComputeEndpoint
if endpoints, err = hcn.ListEndpointsOfNetwork(network.Id); err != nil {
logger.Errorf("[Azure CNS] Failed to list endpoints in the network: %s. Error: %v",
hostNCApipaNetworkName, err)
return nil
}

// Delete network if it doesn't have any endpoints
if len(endpoints) == 0 {
logger.Debugf("[Azure CNS] Deleting network with ID: %s", network.Id)
if err = deleteNetworkByIDHnsV2(network.Id); err == nil {
// Delete the loopback adapter created for this network
networkcontainers.DeleteLoopbackAdapter(hostNCLoopbackAdapterName)
}
}
}

return nil
}
}