添加LocalStoreLifeCycle

saleson · saleson · commit 13a17eb06420 · 2019-07-03T09:08:29.000+08:00
diff --git a/spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/configuration/HystrixGrayAutoConfiguration.java b/spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/configuration/HystrixGrayAutoConfiguration.java
@@ -1,7 +1,9 @@
 package cn.springcloud.gray.client.netflix.configuration;
 
 import cn.springcloud.gray.GrayManager;
+import cn.springcloud.gray.client.netflix.hystrix.HystrixLocalStorageCycle;
 import cn.springcloud.gray.client.netflix.hystrix.HystrixRequestLocalStorage;
+import cn.springcloud.gray.request.LocalStorageLifeCycle;
 import cn.springcloud.gray.request.RequestLocalStorage;
 import com.netflix.hystrix.HystrixCommand;
 import feign.hystrix.HystrixFeign;
@@ -25,6 +27,11 @@ public RequestLocalStorage requestLocalStorage() {
         return new HystrixRequestLocalStorage();
     }
 
+    @Bean
+    public LocalStorageLifeCycle localStorageLifeCycle() {
+        return new HystrixLocalStorageCycle();
+    }
+
 
     /**
      * 支持hystrix使用线程隔离时依然能够进行跑线程传递GrayRequest
diff --git a/spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/configuration/NetflixRibbonGrayAutoConfiguration.java b/spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/configuration/NetflixRibbonGrayAutoConfiguration.java
@@ -4,6 +4,7 @@
 import cn.springcloud.gray.client.netflix.connectionpoint.DefaultRibbonConnectionPoint;
 import cn.springcloud.gray.client.netflix.connectionpoint.RibbonConnectionPoint;
 import cn.springcloud.gray.client.netflix.ribbon.configuration.GrayRibbonClientsConfiguration;
+import cn.springcloud.gray.request.LocalStorageLifeCycle;
 import cn.springcloud.gray.request.RequestLocalStorage;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -20,8 +21,8 @@ public class NetflixRibbonGrayAutoConfiguration {
     @Bean
     @ConditionalOnMissingBean
     public RibbonConnectionPoint ribbonConnectionPoint(
-            GrayManager grayManager, RequestLocalStorage requestLocalStorage) {
-        return new DefaultRibbonConnectionPoint(grayManager, requestLocalStorage);
+            GrayManager grayManager, RequestLocalStorage requestLocalStorage, LocalStorageLifeCycle localStorageLifeCycle) {
+        return new DefaultRibbonConnectionPoint(grayManager, requestLocalStorage, localStorageLifeCycle);
     }
 
 }
diff --git a/spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/connectionpoint/DefaultHystrixRibbonConnectionPoint.java b/spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/connectionpoint/DefaultHystrixRibbonConnectionPoint.java
@@ -1,15 +1,19 @@
 package cn.springcloud.gray.client.netflix.connectionpoint;
 
 import cn.springcloud.gray.GrayManager;
+import cn.springcloud.gray.request.LocalStorageLifeCycle;
 import cn.springcloud.gray.request.RequestLocalStorage;
 
 @Deprecated
 public class DefaultHystrixRibbonConnectionPoint extends DefaultRibbonConnectionPoint {
 
     private ThreadLocal<Boolean> hystrixRequestContextInitialized = new ThreadLocal<>();
 
-    public DefaultHystrixRibbonConnectionPoint(GrayManager grayManager, RequestLocalStorage requestLocalStorage) {
-        super(grayManager, requestLocalStorage);
+    public DefaultHystrixRibbonConnectionPoint(
+            GrayManager grayManager,
+            RequestLocalStorage requestLocalStorage,
+            LocalStorageLifeCycle localStorageLifeCycle) {
+        super(grayManager, requestLocalStorage, localStorageLifeCycle);
     }
 
 
diff --git a/spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/connectionpoint/DefaultRibbonConnectionPoint.java b/spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/connectionpoint/DefaultRibbonConnectionPoint.java
@@ -4,6 +4,7 @@
 import cn.springcloud.gray.RequestInterceptor;
 import cn.springcloud.gray.request.GrayRequest;
 import cn.springcloud.gray.request.GrayTrackInfo;
+import cn.springcloud.gray.request.LocalStorageLifeCycle;
 import cn.springcloud.gray.request.RequestLocalStorage;
 
 import java.util.List;
@@ -12,16 +13,21 @@ public class DefaultRibbonConnectionPoint implements RibbonConnectionPoint {
 
     private GrayManager grayManager;
     private RequestLocalStorage requestLocalStorage;
+    private LocalStorageLifeCycle localStorageLifeCycle;
 
-    public DefaultRibbonConnectionPoint(GrayManager grayManager, RequestLocalStorage requestLocalStorage) {
+    public DefaultRibbonConnectionPoint(
+            GrayManager grayManager,
+            RequestLocalStorage requestLocalStorage,
+            LocalStorageLifeCycle localStorageLifeCycle) {
         this.grayManager = grayManager;
         this.requestLocalStorage = requestLocalStorage;
+        this.localStorageLifeCycle = localStorageLifeCycle;
     }
 
     @Override
     public void executeConnectPoint(ConnectPointContext connectPointContext) {
 
-        requestLocalStorage.initContext();
+        localStorageLifeCycle.initContext();
 
         ConnectPointContext.setContextLocal(connectPointContext);
         GrayRequest grayRequest = connectPointContext.getGrayRequest();
@@ -58,7 +64,7 @@ public void shutdownconnectPoint(ConnectPointContext connectPointContext) {
             ConnectPointContext.removeContextLocal();
             requestLocalStorage.removeGrayRequest();
         } finally {
-            requestLocalStorage.closeContext();
+            localStorageLifeCycle.closeContext();
         }
     }
 
diff --git a/spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/hystrix/HystrixLocalStorageCycle.java b/spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/hystrix/HystrixLocalStorageCycle.java
@@ -0,0 +1,27 @@
+package cn.springcloud.gray.client.netflix.hystrix;
+
+import cn.springcloud.gray.request.LocalStorageLifeCycle;
+import com.netflix.hystrix.strategy.concurrency.HystrixRequestContext;
+
+public class HystrixLocalStorageCycle implements LocalStorageLifeCycle {
+
+
+    private ThreadLocal<Boolean> hystrixRequestContextInitialized = new ThreadLocal<>();
+
+
+    @Override
+    public void initContext() {
+        if (!HystrixRequestContext.isCurrentThreadInitialized()) {
+            HystrixRequestContext.initializeContext();
+            hystrixRequestContextInitialized.set(true);
+        }
+    }
+
+    @Override
+    public void closeContext() {
+        Boolean hystrixReqCxtInited = hystrixRequestContextInitialized.get();
+        if (hystrixReqCxtInited != null && hystrixReqCxtInited && HystrixRequestContext.isCurrentThreadInitialized()) {
+            HystrixRequestContext.getContextForCurrentThread().shutdown();
+        }
+    }
+}
diff --git a/spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/hystrix/HystrixRequestLocalStorage.java b/spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/hystrix/HystrixRequestLocalStorage.java
@@ -3,25 +3,15 @@
 import cn.springcloud.gray.request.GrayRequest;
 import cn.springcloud.gray.request.GrayTrackInfo;
 import cn.springcloud.gray.request.RequestLocalStorage;
-import com.netflix.hystrix.strategy.concurrency.HystrixRequestContext;
 import com.netflix.hystrix.strategy.concurrency.HystrixRequestVariableDefault;
 
 public class HystrixRequestLocalStorage implements RequestLocalStorage {
 
 
-    private ThreadLocal<Boolean> hystrixRequestContextInitialized = new ThreadLocal<>();
     private static final HystrixRequestVariableDefault<GrayTrackInfo> grayTrackInfoLocal = new HystrixRequestVariableDefault<GrayTrackInfo>();
     private static final HystrixRequestVariableDefault<GrayRequest> rrayRequestLocal = new HystrixRequestVariableDefault<GrayRequest>();
 
 
-    @Override
-    public void initContext() {
-        if (!HystrixRequestContext.isCurrentThreadInitialized()) {
-            HystrixRequestContext.initializeContext();
-            hystrixRequestContextInitialized.set(true);
-        }
-    }
-
     @Override
     public void setGrayTrackInfo(GrayTrackInfo grayTrackInfo) {
         grayTrackInfoLocal.set(grayTrackInfo);
@@ -52,11 +42,4 @@ public GrayRequest getGrayRequest() {
         return rrayRequestLocal.get();
     }
 
-    @Override
-    public void closeContext() {
-        Boolean hystrixReqCxtInited = hystrixRequestContextInitialized.get();
-        if (hystrixReqCxtInited != null && hystrixReqCxtInited && HystrixRequestContext.isCurrentThreadInitialized()) {
-            HystrixRequestContext.getContextForCurrentThread().shutdown();
-        }
-    }
 }
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/GrayClientHolder.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/GrayClientHolder.java
@@ -1,5 +1,6 @@
 package cn.springcloud.gray;
 
+import cn.springcloud.gray.request.LocalStorageLifeCycle;
 import cn.springcloud.gray.request.RequestLocalStorage;
 import cn.springcloud.gray.servernode.ServerExplainer;
 import cn.springcloud.gray.servernode.ServerListProcessor;
@@ -8,6 +9,7 @@ public class GrayClientHolder {
 
     private static GrayManager grayManager;
     private static RequestLocalStorage requestLocalStorage;
+    private static LocalStorageLifeCycle localStorageLifeCycle;
     private static ServerExplainer<?> serverExplainer;
     private static ServerListProcessor<?> serverListProcessor;
 
@@ -27,6 +29,14 @@ public static void setRequestLocalStorage(RequestLocalStorage requestLocalStorag
         GrayClientHolder.requestLocalStorage = requestLocalStorage;
     }
 
+    public static void setLocalStorageLifeCycle(LocalStorageLifeCycle localStorageLifeCycle) {
+        GrayClientHolder.localStorageLifeCycle = localStorageLifeCycle;
+    }
+
+    public static LocalStorageLifeCycle getLocalStorageLifeCycle() {
+        return localStorageLifeCycle;
+    }
+
     public static <SERVER> ServerExplainer<SERVER> getServerExplainer() {
         return (ServerExplainer<SERVER>) serverExplainer;
     }
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/GrayClientInitializer.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/GrayClientInitializer.java
@@ -1,5 +1,6 @@
 package cn.springcloud.gray;
 
+import cn.springcloud.gray.request.LocalStorageLifeCycle;
 import cn.springcloud.gray.request.RequestLocalStorage;
 import cn.springcloud.gray.servernode.ServerExplainer;
 import cn.springcloud.gray.servernode.ServerListProcessor;
@@ -19,6 +20,7 @@ public class GrayClientInitializer implements ApplicationContextAware, Initializ
     public void afterPropertiesSet() throws Exception {
         GrayClientHolder.setGrayManager(getBean("grayManager", GrayManager.class));
         GrayClientHolder.setRequestLocalStorage(getBean("requestLocalStorage", RequestLocalStorage.class));
+        GrayClientHolder.setLocalStorageLifeCycle(getBean("localStorageLifeCycle", LocalStorageLifeCycle.class));
         GrayClientHolder.setServerExplainer(getBean("serverExplainer", ServerExplainer.class));
         GrayClientHolder.setServerListProcessor(
                 getBean("serverListProcessor", ServerListProcessor.class, new ServerListProcessor.Default()));
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/config/GrayClientAutoConfiguration.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/config/GrayClientAutoConfiguration.java
@@ -7,6 +7,7 @@
 import cn.springcloud.gray.communication.InformationClient;
 import cn.springcloud.gray.decision.GrayDecision;
 import cn.springcloud.gray.decision.GrayDecisionFactoryKeeper;
+import cn.springcloud.gray.request.LocalStorageLifeCycle;
 import cn.springcloud.gray.request.RequestLocalStorage;
 import cn.springcloud.gray.request.ThreadLocalRequestStorage;
 import com.github.benmanes.caffeine.cache.Caffeine;
@@ -76,6 +77,11 @@ public RequestLocalStorage requestLocalStorage() {
         return new ThreadLocalRequestStorage();
     }
 
+    @Bean
+    @ConditionalOnMissingBean
+    public LocalStorageLifeCycle localStorageLifeCycle() {
+        return new LocalStorageLifeCycle.NoOpLocalStorageLifeCycle();
+    }
 
     @Bean
     public GrayClientInitializer grayClientInitializer() {
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/concurrent/GrayAsyncContext.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/concurrent/GrayAsyncContext.java
@@ -1,13 +1,15 @@
 package cn.springcloud.gray.concurrent;
 
 import cn.springcloud.gray.request.GrayTrackInfo;
+import cn.springcloud.gray.request.LocalStorageLifeCycle;
 import cn.springcloud.gray.request.RequestLocalStorage;
 import lombok.Data;
 
 @Data
 public abstract class GrayAsyncContext {
 
     protected RequestLocalStorage requestLocalStorage;
+    protected LocalStorageLifeCycle localStorageLifeCycle;
 
     protected GrayTrackInfo grayTrackInfo;
 
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/concurrent/GrayCallable.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/concurrent/GrayCallable.java
@@ -1,6 +1,7 @@
 package cn.springcloud.gray.concurrent;
 
 import cn.springcloud.gray.request.GrayTrackInfo;
+import cn.springcloud.gray.request.LocalStorageLifeCycle;
 import cn.springcloud.gray.request.RequestLocalStorage;
 
 import java.util.concurrent.Callable;
@@ -16,13 +17,14 @@ public GrayCallable(GrayCallableContext context) {
     @Override
     public V call() throws Exception {
         GrayTrackInfo grayTrackInfo = context.getGrayTrackInfo();
+        LocalStorageLifeCycle localStorageLifeCycle = context.getLocalStorageLifeCycle();
+        localStorageLifeCycle.initContext();
         RequestLocalStorage requestLocalStorage = context.getRequestLocalStorage();
-        requestLocalStorage.initContext();
         requestLocalStorage.setGrayTrackInfo(grayTrackInfo);
         try {
             return (V) context.getTarget().call();
         } finally {
-            requestLocalStorage.closeContext();
+            localStorageLifeCycle.closeContext();
         }
     }
 }
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/concurrent/GrayConcurrentHelper.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/concurrent/GrayConcurrentHelper.java
@@ -26,40 +26,38 @@ public static <V> Collection<Callable<V>> mapDelegateCallables(Collection<? exte
     }
 
     public static <V> Callable<V> createDelegateCallable(Callable<V> callable) {
-        GrayCallableContext context = createGrayCallableContext(callable);
-        if (context.getGrayTrackInfo() != null) {
-            return new GrayCallable<>(context);
+        if (getGrayTrackInfo() != null) {
+            return new GrayCallable<>(createGrayCallableContext(callable));
         }
         return callable;
     }
 
     public static Runnable createDelegateRunnable(Runnable runnable) {
-        GrayRunnableContext context = createGrayRunnableContext(runnable);
-        if (context.getGrayTrackInfo() != null) {
-            return new GrayRunnable(context);
+        if (getGrayTrackInfo() != null) {
+            return new GrayRunnable(createGrayRunnableContext(runnable));
         }
         return runnable;
     }
 
     public static GrayRunnableContext createGrayRunnableContext(Runnable runnable) {
         GrayRunnableContext context = new GrayRunnableContext();
-        RequestLocalStorage requestLocalStorage = GrayClientHolder.getRequestLocalStorage();
-        context.setRequestLocalStorage(requestLocalStorage);
-        context.setGrayTrackInfo(getGraTrackInfo());
+        context.setLocalStorageLifeCycle(GrayClientHolder.getLocalStorageLifeCycle());
+        context.setRequestLocalStorage(GrayClientHolder.getRequestLocalStorage());
+        context.setGrayTrackInfo(getGrayTrackInfo());
         context.setTarget(runnable);
         return context;
     }
 
     public static <V> GrayCallableContext createGrayCallableContext(Callable<V> callable) {
         GrayCallableContext context = new GrayCallableContext();
-        RequestLocalStorage requestLocalStorage = GrayClientHolder.getRequestLocalStorage();
-        context.setRequestLocalStorage(requestLocalStorage);
-        context.setGrayTrackInfo(getGraTrackInfo());
+        context.setRequestLocalStorage(GrayClientHolder.getRequestLocalStorage());
+        context.setLocalStorageLifeCycle(GrayClientHolder.getLocalStorageLifeCycle());
+        context.setGrayTrackInfo(getGrayTrackInfo());
         context.setTarget(callable);
         return context;
     }
 
-    public static GrayTrackInfo getGraTrackInfo() {
+    public static GrayTrackInfo getGrayTrackInfo() {
         RequestLocalStorage requestLocalStorage = GrayClientHolder.getRequestLocalStorage();
         return requestLocalStorage == null ? null : requestLocalStorage.getGrayTrackInfo();
     }
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/concurrent/GrayExecutor.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/concurrent/GrayExecutor.java
@@ -12,9 +12,6 @@ public GrayExecutor(Executor delegater) {
 
     @Override
     public void execute(Runnable command) {
-        if (GrayConcurrentHelper.getGraTrackInfo() == null) {
-            delegater.execute(command);
-        }
         delegater.execute(GrayConcurrentHelper.createDelegateRunnable(command));
     }
 }
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/concurrent/GrayExecutorService.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/concurrent/GrayExecutorService.java
@@ -56,31 +56,31 @@ public Future<?> submit(Runnable task) {
 
     @Override
     public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks) throws InterruptedException {
-        if (getGraTrackInfo() != null) {
+        if (getGrayTrackInfo() != null) {
             return delegater.invokeAll(mapDelegateCallables(tasks));
         }
         return delegater.invokeAll(tasks);
     }
 
     @Override
     public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit) throws InterruptedException {
-        if (getGraTrackInfo() != null) {
+        if (getGrayTrackInfo() != null) {
             return delegater.invokeAll(mapDelegateCallables(tasks), timeout, unit);
         }
         return delegater.invokeAll(tasks);
     }
 
     @Override
     public <T> T invokeAny(Collection<? extends Callable<T>> tasks) throws InterruptedException, ExecutionException {
-        if (getGraTrackInfo() != null) {
+        if (getGrayTrackInfo() != null) {
             return delegater.invokeAny(mapDelegateCallables(tasks));
         }
         return delegater.invokeAny(tasks);
     }
 
     @Override
     public <T> T invokeAny(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
-        if (getGraTrackInfo() != null) {
+        if (getGrayTrackInfo() != null) {
             return delegater.invokeAny(mapDelegateCallables(tasks), timeout, unit);
         }
         return delegater.invokeAny(tasks);
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/concurrent/GrayRunnable.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/concurrent/GrayRunnable.java
@@ -1,6 +1,7 @@
 package cn.springcloud.gray.concurrent;
 
 import cn.springcloud.gray.request.GrayTrackInfo;
+import cn.springcloud.gray.request.LocalStorageLifeCycle;
 import cn.springcloud.gray.request.RequestLocalStorage;
 
 public class GrayRunnable implements Runnable {
@@ -14,13 +15,14 @@ public GrayRunnable(GrayRunnableContext context) {
     @Override
     public void run() {
         GrayTrackInfo grayTrackInfo = context.getGrayTrackInfo();
+        LocalStorageLifeCycle localStorageLifeCycle = context.getLocalStorageLifeCycle();
+        localStorageLifeCycle.initContext();
         RequestLocalStorage requestLocalStorage = context.getRequestLocalStorage();
-        requestLocalStorage.initContext();
         requestLocalStorage.setGrayTrackInfo(grayTrackInfo);
         try {
             context.getTarget().run();
         } finally {
-            requestLocalStorage.closeContext();
+            localStorageLifeCycle.closeContext();
         }
     }
 }
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/concurrent/GrayTaskDecorator.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/concurrent/GrayTaskDecorator.java
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/request/LocalStorageLifeCycle.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/request/LocalStorageLifeCycle.java
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/request/RequestLocalStorage.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/request/RequestLocalStorage.java
diff --git a/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/request/ThreadLocalRequestStorage.java b/spring-cloud-gray-client/src/main/java/cn/springcloud/gray/request/ThreadLocalRequestStorage.java
