From c3748dfb55f2fe59996b10ccfe1b0a56c34d1885 Mon Sep 17 00:00:00 2001 From: lym <2499445495@qq.com> Date: Tue, 15 Jul 2025 14:41:29 +0800 Subject: [PATCH] fix:error log (#4020) --- .../nacos/loadbalancer/NacosLoadBalancer.java | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/loadbalancer/NacosLoadBalancer.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/loadbalancer/NacosLoadBalancer.java index 16403fd60a..60684dd9f2 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/loadbalancer/NacosLoadBalancer.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/loadbalancer/NacosLoadBalancer.java @@ -16,22 +16,12 @@ package com.alibaba.cloud.nacos.loadbalancer; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.regex.Pattern; -import java.util.stream.Collectors; - -import javax.annotation.PostConstruct; - import com.alibaba.cloud.commons.lang.StringUtils; import com.alibaba.cloud.nacos.NacosDiscoveryProperties; import com.alibaba.cloud.nacos.util.InetIPv6Utils; import com.alibaba.nacos.client.naming.utils.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import reactor.core.publisher.Mono; - import org.springframework.beans.factory.ObjectProvider; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.loadbalancer.DefaultResponse; @@ -41,6 +31,14 @@ import org.springframework.cloud.loadbalancer.core.NoopServiceInstanceListSupplier; import org.springframework.cloud.loadbalancer.core.ReactorServiceInstanceLoadBalancer; import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier; +import reactor.core.publisher.Mono; + +import javax.annotation.PostConstruct; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.regex.Pattern; +import java.util.stream.Collectors; /** * see original. @@ -152,13 +150,12 @@ private Response getInstanceResponse(Request request, }).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(sameClusterInstances)) { instancesToChoose = sameClusterInstances; + } else { + log.warn("A cross-cluster call occurs，name = {}, clusterName = {}, instance = {}", + serviceId, clusterName, serviceInstances); } } - else { - log.warn( - "A cross-cluster call occurs，name = {}, clusterName = {}, instance = {}", - serviceId, clusterName, serviceInstances); - } + instancesToChoose = this.filterInstanceByIpType(instancesToChoose); // Filter the service list sequentially based on the order number