fix route for vlan

yunify · Aug 23, 2024 · 01c9731 · 01c9731
1 parent 97277a9
commit 01c9731
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/pkg/allocator/allocator.go b/pkg/allocator/allocator.go
@@ -313,7 +313,7 @@ func (a *Allocator) IPAddrReNew() {
 	for _, nic := range a.nics {
 		if nic != nil {
 			nicKey := getNicKey(nic.Nic)
-			if nic.isOK() && nic.Nic.VxNet.TunnelType == qcclient.TunnelTypeVlan {
+			if nic.isOK() && nic.Nic.VxNet.TunnelType == constants.TunnelTypeVlan {
 				brName := constants.GetHostNicBridgeName(int(nic.Nic.RouteTableNum))
 				// renew ip lease
 				err := networkutils.UpdateLinkIPAddrAndLease(nic.Nic)

diff --git a/pkg/constants/types.go b/pkg/constants/types.go
@@ -89,6 +89,11 @@ const (
 	EventDelete = "delete"
 
 	MetricsDummyNamespaceForSubnet = "Dummy-ns-for-unmapped-subnets"
+
+	TunnelTypeVlan = "vlan"
+
+	RouteExistsError    = "file exists"
+	RouteNotExistsError = "no such process"
 )
 
 func GetHostNicBridgeName(routeTableNum int) string {

diff --git a/pkg/networkutils/networkutil.go b/pkg/networkutils/networkutil.go
@@ -6,6 +6,7 @@ import (
 	"net"
 	"os"
 	"os/exec"
+	"strings"
 	"time"
 
 	"github.com/containernetworking/plugins/pkg/ns"
@@ -222,7 +223,7 @@ func (n NetworkUtils) setupBridgeNetwork(link netlink.Link, brName, tunnelType s
 	if err != nil {
 		return fmt.Errorf("failed to set link %s up: %v", la.Name, err)
 	}
-	if tunnelType == qcclient.TunnelTypeVlan {
+	if tunnelType == constants.TunnelTypeVlan {
 		// get an ip addr and add to br
 		// 1.get an ip addr from dhcp server
 		bootConf, err := getIPAddrFromDHCPServer(brName)
@@ -284,9 +285,21 @@ func (n NetworkUtils) setupRouteTable(nic *rpc.HostNic) error {
 		},
 	}
 
-	for _, r := range routes {
-		if err := netlink.RouteAdd(&r); err != nil && !os.IsExist(err) {
-			return fmt.Errorf("failed to add route %v: %v", r, err)
+	// if tunnel type is vlan, clear route to repair hostnic
+	if nic.VxNet.TunnelType == constants.TunnelTypeVlan {
+		for _, r := range routes {
+			// netlink.RouteDel return error if route not exists: no such process
+			if err := netlink.RouteDel(&r); err != nil && !strings.Contains(err.Error(), constants.RouteNotExistsError) {
+				return fmt.Errorf("failed to del route %v: %v", r, err)
+			}
+		}
+
+	} else {
+		for _, r := range routes {
+			// netlink.RouteAdd return error if route already exists: file exists ; shouldn't use os.IsExist here
+			if err := netlink.RouteAdd(&r); err != nil && !strings.Contains(err.Error(), constants.RouteExistsError) {
+				return fmt.Errorf("failed to add route %v: %v", r, err)
+			}
 		}
 	}
 

diff --git a/pkg/qcclient/wrapper.go b/pkg/qcclient/wrapper.go
@@ -28,7 +28,6 @@ const (
 	reservedVIPCount              = 12
 	reservedVIPCountForVlan int64 = 7 //reserve 1/7 ip for hostnic br
 
-	TunnelTypeVlan = "vlan"
 )
 
 var (
@@ -478,7 +477,7 @@ func (q *qingcloudAPIWrapper) getVxNets(ids []string, public bool) ([]*rpc.VxNet
 			if qcVxNet.TunnelType != nil {
 				vxnetItem.TunnelType = *qcVxNet.TunnelType
 			}
-			if vxnetItem.TunnelType == TunnelTypeVlan {
+			if vxnetItem.TunnelType == constants.TunnelTypeVlan {
 				// parse ip_network to get mask; if mask is 24, reserve more ip than specifc in config
 				_, ipNet, err := net.ParseCIDR(vxnetItem.Network)
 				if err != nil {