fix idempotent issue

Signed-off-by: l1b0k <[email protected]>
AliyunContainerService · Feb 23, 2024 · 8300be8 · 8300be8
1 parent 99ddd72
commit 8300be8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/daemon/daemon.go b/daemon/daemon.go
@@ -1052,6 +1052,7 @@ func newNetworkService(ctx context.Context, configFilePath, daemonMode string) (
 	}
 
 	podResources := getPodResources(objList)
+	serviceLog.Info(fmt.Sprintf("loaded pod res, %v", podResources))
 
 	if config.EnableEIPMigrate {
 		err = netSrv.migrateEIP(ctx, objList)

diff --git a/pkg/eni/local.go b/pkg/eni/local.go
@@ -323,12 +323,13 @@ func (l *Local) Allocate(ctx context.Context, cni *daemon.CNI, request ResourceR
 	}
 
 	log := logf.FromContext(ctx)
+	log.Info(fmt.Sprintf("local request %v", lo))
 
 	expectV4 := 0
 	expectV6 := 0
 
 	if l.enableIPv4 {
-		ipv4 := l.ipv4.PeekAvailable(cni.PodID, lo.IPv4)
+		ipv4 := l.ipv4.PeekAvailable(cni.PodID)
 		if ipv4 == nil && len(l.ipv4)+l.allocatingV4 >= l.cap {
 			return nil, []Trace{{Condition: Full}}
 		} else if ipv4 == nil {
@@ -337,7 +338,7 @@ func (l *Local) Allocate(ctx context.Context, cni *daemon.CNI, request ResourceR
 	}
 
 	if l.enableIPv6 {
-		ipv6 := l.ipv6.PeekAvailable(cni.PodID, lo.IPv6)
+		ipv6 := l.ipv6.PeekAvailable(cni.PodID)
 		if ipv6 == nil && len(l.ipv6)+l.allocatingV6 >= l.cap {
 			return nil, []Trace{{Condition: Full}}
 		} else if ipv6 == nil {
@@ -452,15 +453,15 @@ func (l *Local) allocWorker(ctx context.Context, cni *daemon.CNI, request *Local
 		var ip types.IPSet2
 		var ipv4, ipv6 *IP
 		if l.enableIPv4 {
-			ipv4 = l.ipv4.PeekAvailable(cni.PodID, request.IPv4)
+			ipv4 = l.ipv4.PeekAvailable(cni.PodID)
 			if ipv4 == nil {
 				l.cond.Wait()
 				continue
 			}
 			ip.IPv4 = ipv4.ip
 		}
 		if l.enableIPv6 {
-			ipv6 = l.ipv6.PeekAvailable(cni.PodID, request.IPv6)
+			ipv6 = l.ipv6.PeekAvailable(cni.PodID)
 			if ipv6 == nil {
 				l.cond.Wait()
 				continue

diff --git a/pkg/eni/types.go b/pkg/eni/types.go
@@ -126,9 +126,9 @@ func (s Set) Allocatable() []*IP {
 	return result
 }
 
-func (s Set) PeekAvailable(podID string, prefer netip.Addr) *IP {
-	if podID != "" && prefer.IsValid() {
-		if v, ok := s[prefer]; ok {
+func (s Set) PeekAvailable(podID string) *IP {
+	if podID != "" {
+		for _, v := range s {
 			if v.podID == podID {
 				return v
 			}

diff --git a/types/daemon/res.go b/types/daemon/res.go
@@ -76,7 +76,7 @@ func (p PodResources) GetResourceItemByType(resType string) []ResourceItem {
 	var ret []ResourceItem
 	for _, r := range p.Resources {
 		if resType == r.Type {
-			ret = append(ret, ResourceItem{Type: resType, ID: r.ID})
+			ret = append(ret, ResourceItem{Type: resType, ID: r.ID, ENIID: r.ENIID, ENIMAC: r.ENIMAC, IPv4: r.IPv4, IPv6: r.IPv6})
 		}
 	}
 	return ret