re-queue and ignore error when batch delete listener failed

Signed-off-by: roc <[email protected]>

Author: imroc

internal/controller/clbbinding.go

@@ -526,6 +526,10 @@ func (r *CLBBindingReconciler[T]) cleanup(ctx context.Context, bd T) (result ctr
 			if e == clb.ErrListenerNotFound { // 监听器不存在，忽略
 				continue
 			}
+			if e == clb.ErrOtherListenerNotFound { // 其它监听器不存在导致本批次删除失败，忽略错误重新入队重试
+				result.Requeue = true
+				return result, nil
+			}
 			if clb.IsLbIdNotFoundError(e) { // lb 不存在，忽略
 				continue
 			}

internal/controller/pod_controller.go

@@ -138,7 +138,8 @@ func (r *PodReconciler) syncCLBHostPortMapping(ctx context.Context, pod *corev1.
 			}
 			for _, bd := range cbd.Status.PortBindings {
 				if bd.Protocol == string(port.Protocol) {
-					if lbPort, ok := matchHostPort(uint16(port.HostPort), bd.Port, bd.LoadbalancerPort, util.GetValue(bd.LoadbalancerEndPort)); ok {
+					lbEndPort := util.GetValue(bd.LoadbalancerEndPort)
+					if lbPort, ok := matchHostPort(uint16(port.HostPort), bd.Port, bd.LoadbalancerPort, lbEndPort); ok {
 						mappings = append(mappings, HostPortMapping{
 							ContainerPort:    uint16(port.ContainerPort),
 							HostPort:         uint16(port.HostPort),

pkg/clb/batch-listener.go

@@ -214,8 +214,9 @@ func (t *DeleteListenerTask) GetRegion() string {
 }
 
 var (
-	DeleteListenerChan  = make(chan *DeleteListenerTask, 100)
-	ErrListenerNotFound = errors.New("listener not found")
+	DeleteListenerChan       = make(chan *DeleteListenerTask, 100)
+	ErrListenerNotFound      = errors.New("listener not found")
+	ErrOtherListenerNotFound = errors.New("other listener not found")
 )
 
 func startDeleteListenerProccessor(concurrent int) {
@@ -238,11 +239,9 @@ func startDeleteListenerProccessor(concurrent int) {
 			if strings.Contains(err.Error(), "Code=InvalidParameter") && strings.Contains(err.Error(), "some ListenerId") && strings.Contains(err.Error(), "not found") {
 				for _, task := range tasks {
 					if strings.Contains(err.Error(), task.ListenerId) { // 返回不存在的错误，让上层不要重试
-						clbLog.V(10).Info("listener not found", "listenerId", task.ListenerId, "rawErr", err.Error())
 						task.Result <- ErrListenerNotFound
 					} else { // 因其它监听器不存在导致本批次监听器没有删除，需要重试
-						clbLog.V(10).Info("other error", "listenerId", task.ListenerId, "rawErr", err.Error())
-						task.Result <- err
+						task.Result <- ErrOtherListenerNotFound
 					}
 				}
 			} else {