Skip to content

Commit 35d89c7

Browse files
committed
优化关闭灰度路由的逻辑
1 parent 3b59430 commit 35d89c7

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/RibbonServerChooser.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package cn.springcloud.gray.client.netflix;
22

3+
import cn.springcloud.gray.GrayClientHolder;
34
import cn.springcloud.gray.GrayManager;
45
import cn.springcloud.gray.ServerChooser;
56
import cn.springcloud.gray.ServerListResult;
@@ -11,6 +12,7 @@
1112
import cn.springcloud.gray.servernode.ServerListProcessor;
1213
import cn.springcloud.gray.servernode.ServerSpec;
1314
import com.netflix.loadbalancer.Server;
15+
import org.apache.commons.collections.ListUtils;
1416
import org.apache.commons.lang3.StringUtils;
1517

1618
import java.util.ArrayList;
@@ -71,10 +73,14 @@ public ServerListResult<Server> distinguishAndMatchGrayServerList(List<Server> s
7173
return null;
7274
}
7375

74-
serverListResult.setGrayServers(
75-
serverListResult.getGrayServers().stream()
76-
.filter(this::matchGrayDecisions)
77-
.collect(Collectors.toList()));
76+
if (GrayClientHolder.getGraySwitcher().isEanbleGrayRouting()) {
77+
serverListResult.setGrayServers(
78+
serverListResult.getGrayServers().stream()
79+
.filter(this::matchGrayDecisions)
80+
.collect(Collectors.toList()));
81+
}else{
82+
serverListResult.setGrayServers(ListUtils.EMPTY_LIST);
83+
}
7884

7985
return serverListResult;
8086
}

0 commit comments

Comments
 (0)