server端管理gray track

Author: saleson

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

@@ -5,6 +5,7 @@
 import cn.springcloud.gray.event.GrayEventListener;
 import cn.springcloud.gray.event.stream.StreamInput;
 import cn.springcloud.gray.event.stream.StreamMessageListener;
+import cn.springcloud.gray.request.track.CommunicableGrayTrackHolder;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -18,8 +19,9 @@ public class GrayEventAutoConfiguration {
 
     @Bean
     @ConditionalOnMissingBean
-    public GrayEventListener grayEventListener(CommunicableGrayManager grayManager) {
-        return new DefaultGrayEventListener(grayManager);
+    public GrayEventListener grayEventListener(
+            CommunicableGrayTrackHolder grayTrackHolder, CommunicableGrayManager grayManager) {
+        return new DefaultGrayEventListener(grayTrackHolder, grayManager);
     }
 
 

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

@@ -1,22 +1,32 @@
 package cn.springcloud.gray.event;
 
 import cn.springcloud.gray.CommunicableGrayManager;
+import cn.springcloud.gray.InstanceLocalInfo;
+import cn.springcloud.gray.InstanceLocalInfoAware;
 import cn.springcloud.gray.exceptions.EventException;
 import cn.springcloud.gray.model.GrayInstance;
+import cn.springcloud.gray.model.GrayTrackDefinition;
+import cn.springcloud.gray.request.track.CommunicableGrayTrackHolder;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Consumer;
 
-public class DefaultGrayEventListener implements GrayEventListener {
+public class DefaultGrayEventListener implements GrayEventListener, InstanceLocalInfoAware {
 
     private CommunicableGrayManager grayManager;
+    private CommunicableGrayTrackHolder grayTrackHolder;
+    private InstanceLocalInfo instanceLocalInfo;
 
     private Map<SourceType, Consumer<GrayEventMsg>> handers = new HashMap<>();
 
-    public DefaultGrayEventListener(CommunicableGrayManager grayManager) {
+    public DefaultGrayEventListener(CommunicableGrayTrackHolder grayTrackHolder, CommunicableGrayManager grayManager) {
         this.grayManager = grayManager;
+        initHandlers();
+        this.grayTrackHolder = grayTrackHolder;
     }
 
     @Override
@@ -59,7 +69,37 @@ private void handleGrayInstance(GrayEventMsg msg) {
     }
 
     private void handleGrayTrack(GrayEventMsg msg) {
-        //todo
+        if (!StringUtils.equals(msg.getServiceId(), instanceLocalInfo.getServiceId())) {
+            return;
+        }
+        if (StringUtils.isNotEmpty(msg.getInstanceId())
+                && !StringUtils.equals(msg.getInstanceId(), instanceLocalInfo.getInstanceId())) {
+            return;
+        }
+
+        GrayTrackDefinition definition = (GrayTrackDefinition) msg.getExtra();
+        if (definition == null) {
+            List<GrayTrackDefinition> definitions =
+                    grayTrackHolder.getGrayInformationClient().getTrackDefinitions(msg.getServiceId(), msg.getInstanceId());
+            if (definitions != null) {
+                definitions.forEach(d -> {
+                    grayTrackHolder.updateTrackDefinition(d);
+                });
+            }
+        } else {
+            switch (msg.getEventType()) {
+                case DOWN:
+                    grayTrackHolder.deleteTrackDefinition(definition.getName());
+                case UPDATE:
+                    grayTrackHolder.updateTrackDefinition(definition);
+            }
+        }
 
+
+    }
+
+    @Override
+    public void setInstanceLocalInfo(InstanceLocalInfo instanceLocalInfo) {
+        this.instanceLocalInfo = instanceLocalInfo;
     }
 }

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/request/track/AbstractCommunicableTrayTrackHolder.java renamed to spring-cloud-gray-client/src/main/java/cn/springcloud/gray/request/track/AbstractCommunicableGrayTrackHolder.java

@@ -7,12 +7,12 @@
 
 import java.util.List;
 
-public abstract class AbstractCommunicableTrayTrackHolder extends SimpleGrayTrackHolder implements CommunicableTrayTrackHolder {
+public abstract class AbstractCommunicableGrayTrackHolder extends SimpleGrayTrackHolder implements CommunicableGrayTrackHolder {
 
 
     private InformationClient informationClient;
 
-    public AbstractCommunicableTrayTrackHolder(
+    public AbstractCommunicableGrayTrackHolder(
             InformationClient informationClient,
             List<GrayInfoTracker<? extends GrayTrackInfo, ?>> trackers,
             List<GrayTrackDefinition> trackDefinitions) {

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/request/track/CommunicableTrayTrackHolder.java renamed to spring-cloud-gray-client/src/main/java/cn/springcloud/gray/request/track/CommunicableGrayTrackHolder.java

@@ -2,5 +2,5 @@
 
 import cn.springcloud.gray.GrayServerCommunicable;
 
-public interface CommunicableTrayTrackHolder extends GrayServerCommunicable, GrayTrackHolder {
+public interface CommunicableGrayTrackHolder extends GrayServerCommunicable, GrayTrackHolder {
 }

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/request/track/DefaultGrayTrackHolder.java

@@ -16,7 +16,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 @Slf4j
-public class DefaultGrayTrackHolder extends AbstractCommunicableTrayTrackHolder implements InstanceLocalInfoAware {
+public class DefaultGrayTrackHolder extends AbstractCommunicableGrayTrackHolder implements InstanceLocalInfoAware {
 
     private Timer updateTimer = new Timer("Gray-Track-Update-Timer", true);
     private GrayTrackProperties grayTrackProperties;

spring-cloud-gray-core/src/main/java/cn/springcloud/gray/event/GrayEventMsg.java

@@ -16,4 +16,6 @@ public class GrayEventMsg implements Serializable {
     private EventType eventType;
     private SourceType sourceType;
 
+    private Object extra;
+
 }

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

@@ -19,7 +19,7 @@ spring:
     show-sql: true
     generate-ddl: true
     hibernate:
-      ddl-auto: none
+      ddl-auto: update
   rabbitmq:
     addresses: 127.0.0.1:5672
     username: admin
@@ -40,7 +40,7 @@ spring:
             #          GrayEventInput:
             #            consumer:
             #              maxConcurrency: 1 #并发数
-            #              prefetch: 1 #从mq一次获取消息的数量
+          #              prefetch: 1 #从mq一次获取消息的数量
           #              requeueRejected: true #spring cloud stream 如果出现异常， 是否需要重新投递消息， false表示丢弃。  也有相应的Exception， true-MessageRejectedWhileStoppingException false-AmqpRejectAndDontRequeueException
           #              auto-bind-dlq: true
           #              acknowledgeMode: AUTO

spring-cloud-gray-samples/spring-cloud-gray-server-sample/src/test/java/cn/springcloud/gray/service/test/GrayTrackServiceTest.java

@@ -0,0 +1,53 @@
+package cn.springcloud.gray.service.test;
+
+import cn.springcloud.gray.server.app.GrayServerApplication;
+import cn.springcloud.gray.server.module.domain.GrayTrack;
+import cn.springcloud.gray.server.service.GrayTrackService;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@ActiveProfiles({"dev"})
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = GrayServerApplication.class)
+@Slf4j
+public class GrayTrackServiceTest {
+
+    @Autowired
+    private GrayTrackService grayTrackService;
+
+    @Test
+    public void test1() {
+        GrayTrack grayTrack = GrayTrack.builder()
+                .id(1L)
+                .serviceId("a")
+                .instanceId("")
+                .name("test")
+                .infos("infos")
+                .build();
+
+        grayTrackService.saveModel(grayTrack);
+
+
+        grayTrackService.saveModel(GrayTrack.builder()
+                .serviceId("a")
+                .name("test2")
+                .infos("infos2")
+                .build());
+
+        grayTrackService.saveModel(GrayTrack.builder()
+                .serviceId("a")
+                .instanceId("a-1")
+                .name("test2")
+                .infos("infos2")
+                .build());
+
+        GrayTrack grayTrack1 = grayTrackService.findOneModel(1L);
+        log.info(grayTrack1.toString());
+
+    }
+}

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/configuration/DBStorageConfiguration.java

@@ -2,11 +2,10 @@
 
 import cn.springcloud.gray.event.GrayEventPublisher;
 import cn.springcloud.gray.server.module.GrayServerModule;
+import cn.springcloud.gray.server.module.GrayServerTrackModule;
 import cn.springcloud.gray.server.module.SimpleGrayServerModule;
-import cn.springcloud.gray.server.service.GrayDecisionService;
-import cn.springcloud.gray.server.service.GrayInstanceService;
-import cn.springcloud.gray.server.service.GrayPolicyService;
-import cn.springcloud.gray.server.service.GrayServiceService;
+import cn.springcloud.gray.server.module.SimpleGrayServerTrackModule;
+import cn.springcloud.gray.server.service.*;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.Bean;
@@ -38,6 +37,13 @@ public GrayServerModule grayServerModule(
                 GrayDecisionService grayDecisionService, GrayPolicyService grayPolicyService) {
             return new SimpleGrayServerModule(grayEventPublisher, grayServiceService, grayInstanceService, grayDecisionService, grayPolicyService);
         }
+
+
+        @Bean
+        public GrayServerTrackModule grayServerTrackModule(GrayEventPublisher grayEventPublisher, GrayTrackService grayTrackService) {
+            return new SimpleGrayServerTrackModule(grayEventPublisher, grayTrackService);
+        }
+
     }
 
     @Bean

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/configuration/GrayServerAutoConfiguration.java

@@ -1,15 +1,16 @@
 package cn.springcloud.gray.server.configuration;
 
 import cn.springcloud.gray.event.GrayEventPublisher;
-import cn.springcloud.gray.server.*;
+import cn.springcloud.gray.server.GrayServerInitializingDestroyBean;
 import cn.springcloud.gray.server.configuration.properties.GrayServerProperties;
 import cn.springcloud.gray.server.event.DefaultGrayEventPublisher;
 import cn.springcloud.gray.server.evictor.GrayServerEvictor;
 import cn.springcloud.gray.server.evictor.NoActionGrayServerEvictor;
 import cn.springcloud.gray.server.manager.DefaultGrayServiceManager;
 import cn.springcloud.gray.server.manager.GrayServiceManager;
-import cn.springcloud.gray.server.module.GrayModle;
+import cn.springcloud.gray.server.module.GrayModule;
 import cn.springcloud.gray.server.module.GrayServerModule;
+import cn.springcloud.gray.server.module.GrayServerTrackModule;
 import cn.springcloud.gray.server.module.SimpleGrayModule;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,11 +58,13 @@ public GrayServerEvictor grayServerEvictor() {
 
         @Bean
         @ConditionalOnMissingBean
-        public GrayModle grayModle(GrayServerModule grayServerModule, @Autowired(required = false) ObjectMapper objectMapper) {
+        public GrayModule grayModule(
+                GrayServerModule grayServerModule, GrayServerTrackModule grayServerTrackModule,
+                @Autowired(required = false) ObjectMapper objectMapper) {
             if (objectMapper == null) {
                 objectMapper = new ObjectMapper();
             }
-            return new SimpleGrayModule(grayServerModule, objectMapper);
+            return new SimpleGrayModule(grayServerModule, grayServerTrackModule, objectMapper);
         }
 
         @Bean