Merge pull request #775 from l1b0k/feat/link_not_found

fix: cni tolerate eni not found

Author: BSWANG

pkg/link/interface_linux_test.go

@@ -0,0 +1,14 @@
+package link
+
+import (
+	"errors"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestGetDeviceNumber(t *testing.T) {
+	id, err := GetDeviceNumber("00")
+	assert.True(t, errors.Is(err, ErrNotFound))
+	assert.Equal(t, int32(0), id)
+}

plugin/datapath/ipvlan_linux.go

@@ -323,7 +323,7 @@ func (d *IPvlanDriver) Teardown(ctx context.Context, cfg *types.TeardownCfg, net
 		return err
 	}
 
-	if cfg.EnableNetworkPriority {
+	if cfg.EnableNetworkPriority && cfg.ENIIndex > 0 {
 		link, err := netlink.LinkByIndex(cfg.ENIIndex)
 		if err != nil {
 			if _, ok := err.(netlink.LinkNotFoundError); !ok {
@@ -338,6 +338,9 @@ func (d *IPvlanDriver) Teardown(ctx context.Context, cfg *types.TeardownCfg, net
 	}
 
 	err = func() error {
+		if cfg.ENIIndex <= 0 {
+			return nil
+		}
 		link, err := netlink.LinkByIndex(cfg.ENIIndex)
 		if err != nil {
 			if _, ok := err.(netlink.LinkNotFoundError); !ok {

plugin/datapath/ipvlan_linux_test.go

@@ -304,4 +304,15 @@ func TestDataPathIPvlanL2(t *testing.T) {
 	})
 	assert.NoError(t, err)
 	assert.Equal(t, 0, len(routes))
+
+	err = d.Teardown(context.Background(), &types2.TeardownCfg{
+		HostVETHName:    cfg.HostVETHName,
+		ContainerIfName: cfg.ContainerIfName,
+		ContainerIPNet: &types.IPNetSet{
+			IPv4: containerIPNet,
+			IPv6: containerIPNetIPv6,
+		},
+		ENIIndex: 0,
+	}, containerNS)
+	assert.NoError(t, err)
 }

plugin/datapath/policy_router_linux.go

@@ -476,6 +476,9 @@ func (d *PolicyRoute) Teardown(ctx context.Context, cfg *types.TeardownCfg, netN
 		}
 	}
 
+	if cfg.ENIIndex <= 0 {
+		return nil
+	}
 	link, err := netlink.LinkByIndex(cfg.ENIIndex)
 	if err != nil {
 		if _, ok := err.(netlink.LinkNotFoundError); !ok {

plugin/datapath/policy_router_linux_test.go

@@ -202,4 +202,15 @@ func TestDataPathPolicyRoute(t *testing.T) {
 	for _, r := range rules {
 		t.Logf("%s %#v ", r, r)
 	}
+
+	err = d.Teardown(context.Background(), &types.TeardownCfg{
+		HostVETHName:    cfg.HostVETHName,
+		ContainerIfName: cfg.ContainerIfName,
+		ContainerIPNet: &terwayTypes.IPNetSet{
+			IPv4: containerIPNet,
+			IPv6: containerIPNetIPv6,
+		},
+		ENIIndex: 0,
+	}, containerNS)
+	assert.NoError(t, err)
 }

plugin/terway/cni.go

@@ -418,7 +418,12 @@ func parseTearDownConf(alloc *rpc.NetConf, conf *types.CNIConf, ipType rpc.IPTyp
 	if alloc.GetENIInfo() != nil {
 		mac := alloc.GetENIInfo().GetMAC()
 		if mac != "" {
-			eniIndex, _ = link.GetDeviceNumber(mac)
+			eniIndex, err = link.GetDeviceNumber(mac)
+			if err != nil {
+				if !errors.Is(err, link.ErrNotFound) {
+					return nil, err
+				}
+			}
 		}
 	}