fix: if sriov device, do not delete the host nic

kubeovn · Jul 28, 2020 · e64c613 · e64c613
1 parent baf0d8c
commit e64c613
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/cmd/cni/cni.go b/cmd/cni/cni.go
@@ -118,6 +118,7 @@ func cmdDel(args *skel.CmdArgs) error {
 		ContainerID:  args.ContainerID,
 		NetNs:        args.Netns,
 		Provider:     netConf.Provider,
+		DeviceID:     netConf.DeviceID,
 	})
 }
 

diff --git a/pkg/daemon/handler.go b/pkg/daemon/handler.go
@@ -178,7 +178,7 @@ func (csh cniServerHandler) handleDel(req *restful.Request, resp *restful.Respon
 
 	klog.Infof("delete port request %v", podRequest)
 	if podRequest.Provider == util.OvnProvider {
-		err = csh.deleteNic(podRequest.PodName, podRequest.PodNamespace, podRequest.ContainerID)
+		err = csh.deleteNic(podRequest.PodName, podRequest.PodNamespace, podRequest.ContainerID, podRequest.DeviceID)
 		if err != nil {
 			errMsg := fmt.Errorf("del nic failed %v", err)
 			klog.Error(errMsg)

diff --git a/pkg/daemon/ovs.go b/pkg/daemon/ovs.go
@@ -65,7 +65,7 @@ func (csh cniServerHandler) configureNic(podName, podNamespace, netns, container
 	return nil
 }
 
-func (csh cniServerHandler) deleteNic(podName, podNamespace, containerID string) error {
+func (csh cniServerHandler) deleteNic(podName, podNamespace, containerID, deviceID string) error {
 	hostNicName, _ := generateNicName(containerID)
 	// Remove ovs port
 	output, err := ovs.Exec("--if-exists", "--with-iface", "del-port", "br-int", hostNicName)
@@ -77,18 +77,19 @@ func (csh cniServerHandler) deleteNic(podName, podNamespace, containerID string)
 		return err
 	}
 
-	hostLink, err := netlink.LinkByName(hostNicName)
-	if err != nil {
-		// If link already not exists, return quietly
-		if _, ok := err.(netlink.LinkNotFoundError); ok {
-			return nil
+	if deviceID == "" {
+		hostLink, err := netlink.LinkByName(hostNicName)
+		if err != nil {
+			// If link already not exists, return quietly
+			if _, ok := err.(netlink.LinkNotFoundError); ok {
+				return nil
+			}
+			return fmt.Errorf("find host link %s failed %v", hostNicName, err)
+		}
+		if err = netlink.LinkDel(hostLink); err != nil {
+			return fmt.Errorf("delete host link %s failed %v", hostLink, err)
 		}
-		return fmt.Errorf("find host link %s failed %v", hostNicName, err)
-	}
-	if err = netlink.LinkDel(hostLink); err != nil {
-		return fmt.Errorf("delete host link %s failed %v", hostLink, err)
 	}
-
 	return nil
 }