zianxin/pj_service_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✨ Introducing new features. 灰度路由支持根据nacos 权重

Browse Source
This commit is contained in:
lbw committed 2022-06-08 12:31:28 +08:00
1 parent 92789b167a
commit e5a5c115da
3 files changed
+53 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/filter/GrayReactiveLoadBalancerClientFilter.java
+1 -4
View File
@@ -46,14 +46,11 @@ public class GrayReactiveLoadBalancerClientFilter extends ReactiveLoadBalancerCl
private GatewayLoadBalancerProperties loadBalancerProperties;
private LoadBalancerProperties properties;
private GrayLoadBalancer grayLoadBalancer;
public GrayReactiveLoadBalancerClientFilter(GatewayLoadBalancerProperties loadBalancerProperties,
LoadBalancerProperties properties, GrayLoadBalancer grayLoadBalancer) {
super(null, loadBalancerProperties, properties);
this.properties = properties;
super(null, loadBalancerProperties);
this.grayLoadBalancer = grayLoadBalancer;
this.loadBalancerProperties = loadBalancerProperties;
}
pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/rule/VersionGrayLoadBalancer.java
+16 -14
View File
@@ -19,7 +19,7 @@ package com.pig4cloud.pigx.common.gateway.rule;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.text.CharSequenceUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.nacos.client.naming.utils.Chooser;
import com.alibaba.nacos.client.naming.utils.Pair;
import com.pig4cloud.pigx.common.core.constant.CommonConstants;
@@ -62,16 +62,16 @@ public class VersionGrayLoadBalancer implements GrayLoadBalancer {
}
// 获取请求version，无则随机返回可用实例
String reqVersion = request.getHeaders().getFirst(CommonConstants.VERSION);
if (CharSequenceUtil.isBlank(reqVersion)) {
//过滤出不含VERSION实例
if (StrUtil.isBlank(reqVersion)) {
// 过滤出不含VERSION实例
List<ServiceInstance> versionInstanceList = instances.stream()
.filter(instance -> !instance.getMetadata().containsKey(CommonConstants.VERSION))
.collect(Collectors.toList());
if(CollUtil.isEmpty(versionInstanceList)){
//根据权重获取实例
if (CollUtil.isEmpty(versionInstanceList)) {
// 根据权重获取实例
return randomByWeight(instances);
}
//根据权重获取实例
// 根据权重获取实例
return randomByWeight(versionInstanceList);
}
// 遍历可以实例元数据，若匹配则返回此实例
@@ -80,10 +80,10 @@ public class VersionGrayLoadBalancer implements GrayLoadBalancer {
.equalsIgnoreCase(MapUtil.getStr(instance.getMetadata(), CommonConstants.VERSION)))
.collect(Collectors.toList());
if (CollUtil.isEmpty(availableList)) {
//根据权重获取实例
// 根据权重获取实例
return randomByWeight(instances);
}
//根据权重获取实例
// 根据权重获取实例
return randomByWeight(availableList);
}
@@ -92,17 +92,19 @@ public class VersionGrayLoadBalancer implements GrayLoadBalancer {
* @param serviceInstances 服务实例集合
* @return 服务实例：ServiceInstance
*/
protected ServiceInstance randomByWeight(final List<ServiceInstance> serviceInstances){
if(serviceInstances.size()==1){
protected ServiceInstance randomByWeight(final List<ServiceInstance> serviceInstances) {
if (serviceInstances.size() == 1) {
return serviceInstances.get(0);
}else {
}
else {
List<Pair<ServiceInstance>> hostsWithWeight = new ArrayList<>();
for (ServiceInstance serviceInstance : serviceInstances) {
if ("true".equals(serviceInstance.getMetadata().getOrDefault("nacos.healthy","true"))) {
hostsWithWeight.add(new Pair<>(serviceInstance, Double.parseDouble(serviceInstance.getMetadata().getOrDefault("nacos.weight","1"))));
if ("true".equals(serviceInstance.getMetadata().getOrDefault("nacos.healthy", "true"))) {
hostsWithWeight.add(new Pair<>(serviceInstance,
Double.parseDouble(serviceInstance.getMetadata().getOrDefault("nacos.weight", "1"))));
}
}
Chooser<String, ServiceInstance> vipChooser = new Chooser<>("www.taobao.com",hostsWithWeight);
Chooser<String, ServiceInstance> vipChooser = new Chooser<>("www.taobao.com", hostsWithWeight);
return vipChooser.randomWithWeight();
}
}
pigx-common/pigx-common-gray/src/main/java/com/pig4cloud/pigx/common/gray/rule/GrayRoundRobinLoadBalancer.java
+36 -3
View File
@@ -2,9 +2,10 @@ package com.pig4cloud.pigx.common.gray.rule;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.cloud.nacos.NacosServiceInstance;
import com.alibaba.nacos.client.naming.utils.Chooser;
import com.alibaba.nacos.client.naming.utils.Pair;
import com.pig4cloud.pigx.common.core.constant.CommonConstants;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.ObjectProvider;
@@ -16,6 +17,7 @@ import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
import org.springframework.http.HttpHeaders;
import reactor.core.publisher.Mono;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -73,7 +75,16 @@ public class GrayRoundRobinLoadBalancer extends RoundRobinLoadBalancer {
String reqVersion = headers.getFirst(CommonConstants.VERSION);
if (StrUtil.isBlank(reqVersion)) {
return super.choose(request).block();
// 过滤出不含VERSION实例
List<ServiceInstance> versionInstanceList = instances.stream()
.filter(instance -> !instance.getMetadata().containsKey(CommonConstants.VERSION))
.collect(Collectors.toList());
if (CollUtil.isEmpty(versionInstanceList)) {
// 根据权重获取实例
return new DefaultResponse(randomByWeight(instances));
}
// 根据权重获取实例
return new DefaultResponse(randomByWeight(versionInstanceList));
}
// 遍历可以实例元数据，若匹配则返回此实例
@@ -86,7 +97,7 @@ public class GrayRoundRobinLoadBalancer extends RoundRobinLoadBalancer {
// 存在 随机返回
if (CollUtil.isNotEmpty(serviceInstanceList)) {
ServiceInstance instance = RandomUtil.randomEle(serviceInstanceList);
ServiceInstance instance = randomByWeight(serviceInstanceList);
log.debug("gray instance available serviceId: {} , instanceId: {}", serviceId, instance.getInstanceId());
return new DefaultResponse(instance);
@@ -97,4 +108,26 @@ public class GrayRoundRobinLoadBalancer extends RoundRobinLoadBalancer {
}
}
/**
* 根据nacos设置的权重返回实例
* @param serviceInstances 服务实例集合
* @return 服务实例：ServiceInstance
*/
protected ServiceInstance randomByWeight(final List<ServiceInstance> serviceInstances) {
if (serviceInstances.size() == 1) {
return serviceInstances.get(0);
}
else {
List<Pair<ServiceInstance>> hostsWithWeight = new ArrayList<>();
for (ServiceInstance serviceInstance : serviceInstances) {
if ("true".equals(serviceInstance.getMetadata().getOrDefault("nacos.healthy", "true"))) {
hostsWithWeight.add(new Pair<>(serviceInstance,
Double.parseDouble(serviceInstance.getMetadata().getOrDefault("nacos.weight", "1"))));
}
}
Chooser<String, ServiceInstance> vipChooser = new Chooser<>("www.taobao.com", hostsWithWeight);
return vipChooser.randomWithWeight();
}
}
}