优化代码

添加gray decision缓存

Author: saleson

pom.xml

@@ -70,7 +70,7 @@
         <commons-lang3.version>3.5</commons-lang3.version>
         <guava.version>27.0.1-jre</guava.version>
         <mapstruct.version>1.1.0.Final</mapstruct.version>
-
+        <caffeine.version>2.7.0</caffeine.version>
     </properties>
 
 
@@ -92,6 +92,11 @@
             <!--                <scope>import</scope>-->
             <!--            </dependency>-->
 
+            <dependency>
+                <groupId>com.github.ben-manes.caffeine</groupId>
+                <artifactId>caffeine</artifactId>
+                <version>${caffeine.version}</version>
+            </dependency>
 
             <dependency>
                 <groupId>io.springfox</groupId>

spring-cloud-gray-client/pom.xml

@@ -25,6 +25,10 @@
             <artifactId>spring-boot-autoconfigure</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+        </dependency>
         <dependency>
             <groupId>cn.springcloud.gray</groupId>
             <artifactId>spring-cloud-gray-core</artifactId>

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

@@ -19,7 +19,7 @@
 /**
  * GrayManager的抽象实现类实现了基础的获取灰度列表， 创建灰度决策对象的能力
  */
-public abstract class AbstractGrayManager implements GrayManager {
+public abstract class AbstractGrayManager implements UpdateableGrayManager {
     private static final Logger log = LoggerFactory.getLogger(AbstractGrayManager.class);
 
 

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

@@ -0,0 +1,12 @@
+package cn.springcloud.gray;
+
+import cn.springcloud.gray.decision.GrayDecision;
+
+import java.util.List;
+
+public interface CacheableGrayManager extends UpdateableGrayManager {
+
+
+    Cache<String, List<GrayDecision>> getGrayDecisionCache();
+
+}

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

@@ -0,0 +1,123 @@
+package cn.springcloud.gray;
+
+import cn.springcloud.gray.communication.InformationClient;
+import cn.springcloud.gray.decision.GrayDecision;
+import cn.springcloud.gray.model.GrayInstance;
+import cn.springcloud.gray.model.GrayService;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.function.Supplier;
+
+public class CachedDelegateGrayManager implements CacheableGrayManager, CommunicableGrayManager {
+
+    private GrayManager delegate;
+    private Cache<String, List<GrayDecision>> grayDecisionCache;
+
+
+    public CachedDelegateGrayManager(GrayManager delegate, Cache<String, List<GrayDecision>> grayDecisionCache) {
+        this.delegate = delegate;
+        this.grayDecisionCache = grayDecisionCache;
+    }
+
+    @Override
+    public boolean hasGray(String serviceId) {
+        return delegate.hasGray(serviceId);
+    }
+
+    @Override
+    public Collection<GrayService> allGrayServices() {
+        return delegate.allGrayServices();
+    }
+
+    @Override
+    public GrayService getGrayService(String serviceId) {
+        return delegate.getGrayService(serviceId);
+    }
+
+    @Override
+    public GrayInstance getGrayInstance(String serviceId, String instanceId) {
+        return delegate.getGrayInstance(serviceId, instanceId);
+    }
+
+    @Override
+    public List<GrayDecision> getGrayDecision(GrayInstance instance) {
+        return getCacheGrayDecision(instance.getInstanceId(), () -> delegate.getGrayDecision(instance));
+    }
+
+    @Override
+    public List<GrayDecision> getGrayDecision(String serviceId, String instanceId) {
+        return getCacheGrayDecision(instanceId, () -> delegate.getGrayDecision(serviceId, instanceId));
+    }
+
+
+    @Override
+    public Cache<String, List<GrayDecision>> getGrayDecisionCache() {
+        return grayDecisionCache;
+    }
+
+
+    @Override
+    public void updateGrayInstance(GrayInstance instance) {
+        delegate.updateGrayInstance(instance);
+        invalidateCache(instance.getServiceId(), instance.getInstanceId());
+    }
+
+    @Override
+    public void closeGray(GrayInstance instance) {
+        delegate.closeGray(instance);
+        invalidateCache(instance.getServiceId(), instance.getInstanceId());
+    }
+
+    @Override
+    public void closeGray(String serviceId, String instanceId) {
+        delegate.closeGray(serviceId, instanceId);
+        invalidateCache(serviceId, instanceId);
+    }
+
+    @Override
+    public List<RequestInterceptor> getRequeestInterceptors(String interceptroType) {
+        return delegate.getRequeestInterceptors(interceptroType);
+    }
+
+    @Override
+    public void setup() {
+        delegate.setup();
+    }
+
+    @Override
+    public void shutdown() {
+        delegate.shutdown();
+    }
+
+    @Override
+    public void setGrayServices(Object grayServices) {
+        if (delegate instanceof UpdateableGrayManager) {
+            ((UpdateableGrayManager) delegate).setGrayServices(grayServices);
+            grayDecisionCache.invalidateAll();
+        }
+    }
+
+    @Override
+    public void setRequestInterceptors(Collection<RequestInterceptor> requestInterceptors) {
+        if (delegate instanceof UpdateableGrayManager) {
+            ((UpdateableGrayManager) delegate).setRequestInterceptors(requestInterceptors);
+        }
+    }
+
+    private List<GrayDecision> getCacheGrayDecision(String key, Supplier<List<GrayDecision>> supplier) {
+        return grayDecisionCache.get(key, k -> supplier.get());
+    }
+
+    private void invalidateCache(String serviceId, String instanceId) {
+        grayDecisionCache.invalidate(instanceId);
+    }
+
+    @Override
+    public InformationClient getGrayInformationClient() {
+        if (delegate instanceof CommunicableGrayManager) {
+            return ((CommunicableGrayManager) delegate).getGrayInformationClient();
+        }
+        throw new UnsupportedOperationException("delegate不是CommunicableGrayManager的实现类");
+    }
+}

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

@@ -27,13 +27,17 @@ public DefaultGrayManager(
             InformationClient informationClient) {
         super(grayClientConfig, grayDecisionFactoryKeeper, informationClient);
         this.grayLoadProperties = grayLoadProperties;
-//        openForWork();
     }
 
     @Override
     public void setup() {
         super.setup();
-        openForWork();
+        updateTimer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                openForWork();
+            }
+        }, getGrayClientConfig().getServiceInitializeDelayTimeInMs());
     }
 
     @Override
@@ -67,7 +71,7 @@ private void doUpdate() {
                         updateGrayInstance(grayServices, instance);
                     });
             joinLoadedGrays(grayServices);
-            this.grayServices = grayServices;
+            setGrayServices(grayServices);
         } catch (Exception e) {
             log.error("更新灰度服务列表失败", e);
         } finally {
@@ -79,7 +83,7 @@ private void doUpdate() {
     private void loadPropertiesGrays() {
         Map<String, GrayService> grayServices = new ConcurrentHashMap<>();
         joinLoadedGrays(grayServices);
-        this.grayServices = grayServices;
+        setGrayServices(grayServices);
     }
 
 

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

@@ -33,4 +33,5 @@ public interface GrayClientConfig {
     int getServiceUpdateIntervalTimerInMs();
 
 
+    int getServiceInitializeDelayTimeInMs();
 }

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

@@ -51,8 +51,8 @@ private <T> T getBean(String beanName, Class<T> cls) {
     private void initGrayManagerRequestInterceptors() {
         Map<String, RequestInterceptor> requestInterceptors = cxt.getBeansOfType(RequestInterceptor.class);
         GrayManager grayManager = GrayClientHolder.getGrayManager();
-        if (grayManager instanceof AbstractGrayManager) {
-            ((AbstractGrayManager) grayManager).setRequestInterceptors(requestInterceptors.values());
+        if (grayManager instanceof UpdateableGrayManager) {
+            ((UpdateableGrayManager) grayManager).setRequestInterceptors(requestInterceptors.values());
         }
         grayManager.setup();
     }

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

@@ -112,4 +112,12 @@ public void shutdown() {
     }
 
 
+    @Override
+    public void setGrayServices(Object grayServices) {
+        if (grayServices instanceof Map) {
+            this.grayServices = (Map<String, GrayService>) grayServices;
+        } else {
+            throw new UnsupportedOperationException("setGrayServices(grayServices) 无法支持的参数类型");
+        }
+    }
 }

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

@@ -0,0 +1,12 @@
+package cn.springcloud.gray;
+
+import java.util.Collection;
+
+public interface UpdateableGrayManager extends GrayManager {
+
+    void setGrayServices(Object grayServices);
+
+    void setRequestInterceptors(Collection<RequestInterceptor> requestInterceptors);
+
+
+}