Skip to content

Commit b2ea947

Browse files
authored
remove deleting network adapter when no endpoints (#883)
* remove deleting network adapter when no endpoints * update feedback
1 parent c2b2db1 commit b2ea947

File tree

1 file changed

+20
-23
lines changed

1 file changed

+20
-23
lines changed

cns/hnsclient/hnsclient_windows.go

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,8 @@ func createHostNCApipaNetwork(
304304
},
305305
GatewayIPAddress: localIPConfiguration.GatewayIPAddress,
306306
}
307+
logger.Printf("Print interfaces before creating loopback adapter")
308+
LogNetworkInterfaces()
307309

308310
if err = networkcontainers.CreateLoopbackAdapter(
309311
hostNCLoopbackAdapterName,
@@ -312,6 +314,9 @@ func createHostNCApipaNetwork(
312314
"" /* Empty primary Interface Identifier as setWeakHostOnInterface is not needed*/); err != nil {
313315
return nil, fmt.Errorf("Failed to create loopback adapter. Error: %v", err)
314316
}
317+
318+
logger.Printf("Print interfaces after creating loopback adapter")
319+
LogNetworkInterfaces()
315320
}
316321

317322
// Create the HNS network.
@@ -329,6 +334,20 @@ func createHostNCApipaNetwork(
329334
return network, err
330335
}
331336

337+
// LogNetworkInterfaces logs the host's network interfaces in the default namespace.
338+
func LogNetworkInterfaces() {
339+
interfaces, err := net.Interfaces()
340+
if err != nil {
341+
logger.Printf("Failed to query network interfaces, err:%v", err)
342+
return
343+
}
344+
345+
for _, iface := range interfaces {
346+
addrs, _ := iface.Addrs()
347+
logger.Printf("Network interface: %+v with IP: %+v", iface, addrs)
348+
}
349+
}
350+
332351
func addAclToEndpointPolicy(
333352
aclPolicySetting hcn.AclPolicySetting,
334353
endpointPolicies *[]hcn.EndpointPolicy) error {
@@ -667,27 +686,5 @@ func DeleteHostNCApipaEndpoint(
667686

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

670-
namedLock.LockAcquire(hostNCApipaNetworkName)
671-
defer namedLock.LockRelease(hostNCApipaNetworkName)
672-
673-
// Check if hostNCApipaNetworkName has any endpoints left
674-
if network, err := hcn.GetNetworkByName(hostNCApipaNetworkName); err == nil {
675-
var endpoints []hcn.HostComputeEndpoint
676-
if endpoints, err = hcn.ListEndpointsOfNetwork(network.Id); err != nil {
677-
logger.Errorf("[Azure CNS] Failed to list endpoints in the network: %s. Error: %v",
678-
hostNCApipaNetworkName, err)
679-
return nil
680-
}
681-
682-
// Delete network if it doesn't have any endpoints
683-
if len(endpoints) == 0 {
684-
logger.Debugf("[Azure CNS] Deleting network with ID: %s", network.Id)
685-
if err = deleteNetworkByIDHnsV2(network.Id); err == nil {
686-
// Delete the loopback adapter created for this network
687-
networkcontainers.DeleteLoopbackAdapter(hostNCLoopbackAdapterName)
688-
}
689-
}
690-
}
691-
692689
return nil
693-
}
690+
}

0 commit comments

Comments
 (0)