在灰度中添加使用多版本的控制开关

Author: saleson

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

@@ -1,11 +1,13 @@
 package cn.springcloud.gray.client;
 
 import cn.springcloud.gray.InstanceLocalInfo;
+import cn.springcloud.gray.client.config.properties.GrayClientProperties;
 import cn.springcloud.gray.core.GrayManager;
 
 public class GrayClientAppContext {
     private static GrayManager grayManager;
     private static InstanceLocalInfo instanceLocalInfo;
+    private static GrayClientProperties grayClientProperties;
 
 
     public static GrayManager getGrayManager() {
@@ -24,4 +26,12 @@ public static InstanceLocalInfo getInstanceLocalInfo() {
     static void setInstanceLocalInfo(InstanceLocalInfo instanceLocalInfo) {
         GrayClientAppContext.instanceLocalInfo = instanceLocalInfo;
     }
+
+    public static GrayClientProperties getGrayClientProperties() {
+        return grayClientProperties;
+    }
+
+    static void setGrayClientProperties(GrayClientProperties grayClientProperties) {
+        GrayClientAppContext.grayClientProperties = grayClientProperties;
+    }
 }

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

@@ -1,6 +1,7 @@
 package cn.springcloud.gray.client;
 
 import cn.springcloud.gray.InstanceLocalInfo;
+import cn.springcloud.gray.client.config.properties.GrayClientProperties;
 import cn.springcloud.gray.core.GrayManager;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.InitializingBean;
@@ -16,6 +17,7 @@ public class GrayClientInitializingBean implements InitializingBean, Application
     public void afterPropertiesSet() throws Exception {
         GrayClientAppContext.setGrayManager(cxt.getBean(GrayManager.class));
         GrayClientAppContext.setInstanceLocalInfo(cxt.getBean(InstanceLocalInfo.class));
+        GrayClientAppContext.setGrayClientProperties(cxt.getBean(GrayClientProperties.class));
 
         startForWork();
 

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/config/properties/GrayClientProperties.java

@@ -88,6 +88,7 @@ public class InstanceConfig {
 
         private boolean grayEnroll;
         private int grayEnrollDealyTimeInMs = 40000;
+        private boolean useMultiVersion = false;
 
         public boolean isGrayEnroll() {
             return grayEnroll;
@@ -104,5 +105,18 @@ public int getGrayEnrollDealyTimeInMs() {
         public void setGrayEnrollDealyTimeInMs(int grayEnrollDealyTimeInMs) {
             this.grayEnrollDealyTimeInMs = grayEnrollDealyTimeInMs;
         }
+
+        /**
+         * 是否使用多版本,默认不使用
+         *
+         * @return
+         */
+        public boolean isUseMultiVersion() {
+            return useMultiVersion;
+        }
+
+        public void setUseMultiVersion(boolean useMultiVersion) {
+            this.useMultiVersion = useMultiVersion;
+        }
     }
 }

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/ribbon/GrayLoadBalanceRule.java

@@ -3,31 +3,45 @@
 import cn.springcloud.bamboo.BambooRequestContext;
 import cn.springcloud.bamboo.ribbon.loadbalancer.BambooZoneAvoidanceRule;
 import cn.springcloud.gray.client.GrayClientAppContext;
+import cn.springcloud.gray.client.config.properties.GrayClientProperties;
 import cn.springcloud.gray.core.GrayManager;
 import cn.springcloud.gray.core.GrayService;
 import com.google.common.base.Optional;
-import com.netflix.loadbalancer.AbstractServerPredicate;
-import com.netflix.loadbalancer.CompositePredicate;
-import com.netflix.loadbalancer.ILoadBalancer;
-import com.netflix.loadbalancer.Server;
+import com.netflix.client.config.IClientConfig;
+import com.netflix.loadbalancer.*;
 import com.netflix.niws.loadbalancer.DiscoveryEnabledServer;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import static cn.springcloud.gray.client.GrayClientAppContext.getGrayClientProperties;
+
 
 /**
  * 灰度发布的负载规则
  */
-public class GrayLoadBalanceRule extends BambooZoneAvoidanceRule {
+public class GrayLoadBalanceRule extends ZoneAvoidanceRule {
 
     protected CompositePredicate grayCompositePredicate;
+    protected ZoneAvoidanceRule subDelegate;
 
     public GrayLoadBalanceRule() {
         super();
+        init();
+    }
+
+    protected void init(){
         GrayDecisionPredicate apiVersionPredicate = new GrayDecisionPredicate(this);
-        grayCompositePredicate = CompositePredicate.withPredicates(super.getPredicate(),
-                apiVersionPredicate).build();
+        GrayClientProperties grayClientProperties = GrayClientAppContext.getGrayClientProperties();
+        //如果与多版本一起使用
+        if(grayClientProperties.getInstance().isUseMultiVersion()){
+            subDelegate = new BambooZoneAvoidanceRule();
+            grayCompositePredicate = CompositePredicate.withPredicates(subDelegate.getPredicate(),
+                    apiVersionPredicate).build();
+        }else{
+            grayCompositePredicate = CompositePredicate.withPredicates(super.getPredicate(),
+                    apiVersionPredicate).build();
+        }
     }
 
 
@@ -55,10 +69,28 @@ public Server choose(Object key) {
             } else {
                 return choose(super.getPredicate(), normalServers, key);
             }
+        }else if(subDelegate!=null){
+            return subDelegate.choose(key);
+        }else{
+            return super.choose(key);
         }
-        return super.choose(key);
     }
 
+    @Override
+    public void initWithNiwsConfig(IClientConfig clientConfig) {
+        super.initWithNiwsConfig(clientConfig);
+        if(subDelegate!=null){
+            subDelegate.initWithNiwsConfig(clientConfig);
+        }
+    }
+
+    @Override
+    public void setLoadBalancer(ILoadBalancer lb) {
+        super.setLoadBalancer(lb);
+        if(subDelegate!=null){
+            subDelegate.setLoadBalancer(lb);
+        }
+    }
 
     private Server choose(AbstractServerPredicate serverPredicate, List<Server> servers, Object key) {
         Optional<Server> server = serverPredicate.chooseRoundRobinAfterFiltering(servers, key);

spring-cloud-gray-samples/spring-cloud-gray-zuul-sample/src/main/resources/config/application.yml

@@ -21,4 +21,6 @@ zuul:
 #      serviceId: eureka-client #指定路由到的serviceId
 gray:
   client:
-    server-url: http://localhost:20202 #灰度服务端的url
+    server-url: http://localhost:20202 #灰度服务端的url
+    instance:
+      use-multi-version: true