[GitHub] [apisix-ingress-controller] AlinsRan commented on a diff in pull request #1251: fix: support resolveGranularity of ApisixRoute

[GitBox <gi...@apache.org>]

AlinsRan commented on code in PR #1251:
URL: https://github.com/apache/apisix-ingress-controller/pull/1251#discussion_r963224453


##########
pkg/apisix/upstreamservicerelation.go:
##########
@@ -37,79 +39,82 @@ func newUpstreamServiceRelation(c *cluster) *upstreamService {
 	}
 }
 
-func (u *upstreamService) Get(ctx context.Context, svcId string) (*v1.UpstreamServiceRelation, error) {
+func (u *upstreamService) Get(ctx context.Context, serviceName string) (*v1.UpstreamServiceRelation, error) {
 	log.Debugw("try to get upstreamService in cache",
-		zap.String("svcId", svcId),
+		zap.String("service name", serviceName),
 		zap.String("cluster", "default"),
 	)
-	us, err := u.cluster.cache.GetUpstreamServiceRelation(svcId)
-	if err == nil {
-		return us, nil
-	}
-	if err != cache.ErrNotFound {
+	us, err := u.cluster.cache.GetUpstreamServiceRelation(serviceName)
+	if err != nil && err != cache.ErrNotFound {
 		log.Error("failed to find upstreamService in cache",
-			zap.String("svcId", svcId), zap.Error(err))
-	} else {
-		log.Debugw("failed to find upstreamService in cache",
-			zap.String("svcId", svcId), zap.Error(err))
+			zap.String("service name", serviceName), zap.Error(err))
+		return nil, err
 	}
-	return nil, err
+	return us, err
 }
 
-func (u *upstreamService) Delete(ctx context.Context, relation *v1.UpstreamServiceRelation) error {
+func (u *upstreamService) Delete(ctx context.Context, serviceName string) error {
 	log.Debugw("try to delete upstreamService in cache",
 		zap.String("cluster", "default"),
 	)
-	u.initUpstreamServiceRelation(relation)
-	if relation == nil || relation.ServiceName == "" && relation.UpstreamName == "" {
-		return fmt.Errorf("UpstreamServiceRelation is empty object")
-	}
-	if relation.UpstreamName != "" {
-		err := u.cluster.cache.DeleteUpstreamServiceRelation(relation)
-		if err != nil {
-			return err
-		}
-	} else {
-		usr, err := u.cluster.cache.GetUpstreamServiceRelation(relation.ServiceName)
-		if err != nil {
-			return err
+	relation, err := u.Get(ctx, serviceName)
+	if err != nil {
+		if err == cache.ErrNotFound {
+			return nil
 		}
-		ups, err := u.cluster.upstream.Get(ctx, usr.UpstreamName)
+		return err
+	}
+	for upsName := range relation.UpstreamNames {
+		ups, err := u.cluster.upstream.Get(ctx, upsName)
 		if err != nil {
-			return err
+			continue
 		}
 		ups.Nodes = make(v1.UpstreamNodes, 0)
 		_, err = u.cluster.upstream.Update(ctx, ups)
 		if err != nil {
-			return err
-		}
-		err = u.cluster.cache.DeleteUpstreamServiceRelation(usr)
-		if err != nil {
-			return err
+			continue
 		}
 	}
+	err = u.cluster.cache.DeleteUpstreamServiceRelation(relation)
+	if err != nil {
+		return err
+	}
 	return nil
 }
 
-func (u *upstreamService) Create(ctx context.Context, relation *v1.UpstreamServiceRelation) error {
+// to do: delete one of

Review Comment:
   Delete one of the upstreams. Currently, only service is deleted. There will be some redundant objects, but the results will not be affected.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscribe@apisix.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org