Merge remote-tracking branch 'origin/master' into feature/disable_db

redis/redis-checker/src/main/java/com/ctrip/xpipe/redis/checker/CheckerConsoleService.java

@@ -57,9 +57,7 @@ public interface CheckerConsoleService {
 
     Map<String, Date> loadAllClusterCreateTime(String console);
 
-    Map<String, OuterClientService.ClusterInfo> loadAllDcOneWayClusterInfo(String console, String dc);
-
-    Map<String, OuterClientService.ClusterInfo> loadCurrentDcOneWayClusterInfo(String console, String dc);
+    Map<String, OuterClientService.ClusterInfo> loadAllActiveDcOneWayClusterInfo(String console, String activeDc);
 
     void bindShardSentinel(String console, String dc, String cluster, String shard, SentinelMeta sentinelMeta);
 

redis/redis-checker/src/main/java/com/ctrip/xpipe/redis/checker/CheckerService.java

@@ -17,10 +17,6 @@ class AllInstanceHealthStatus extends HashMap<HostPort, HealthStatusDesc> {}
 
     HEALTH_STATE getInstanceStatus(String ip, int port);
 
-    HEALTH_STATE getCrossRegionInstanceStatus(String ip, int port);
-
     Map<HostPort, HealthStatusDesc> getAllInstanceHealthStatus();
 
-    Map<HostPort, HealthStatusDesc> getAllInstanceCrossRegionHealthStatus();
-
 }

redis/redis-checker/src/main/java/com/ctrip/xpipe/redis/checker/OuterClientCache.java

@@ -12,8 +12,6 @@ public interface OuterClientCache {
 
     OuterClientService.ClusterInfo getClusterInfo(String clusterName) throws Exception;
 
-    Map<String, OuterClientService.ClusterInfo> getAllDcClusters(String dc);
-
-    Map<String, OuterClientService.ClusterInfo> getAllCurrentDcClusters(String dc);
+    Map<String, OuterClientService.ClusterInfo> getAllActiveDcClusters(String activeDc);
 
 }

redis/redis-checker/src/main/java/com/ctrip/xpipe/redis/checker/controller/CheckerHealthController.java

@@ -6,7 +6,6 @@
 import com.ctrip.xpipe.redis.checker.controller.result.ActionContextRetMessage;
 import com.ctrip.xpipe.redis.checker.healthcheck.*;
 import com.ctrip.xpipe.redis.checker.healthcheck.actions.interaction.DefaultDelayPingActionCollector;
-import com.ctrip.xpipe.redis.checker.healthcheck.actions.interaction.DefaultPsubPingActionCollector;
 import com.ctrip.xpipe.redis.checker.healthcheck.actions.interaction.HEALTH_STATE;
 import com.ctrip.xpipe.redis.checker.healthcheck.actions.interaction.HealthStatusDesc;
 import com.ctrip.xpipe.redis.checker.healthcheck.actions.keeper.info.RedisUsedMemoryCollector;
@@ -37,9 +36,6 @@ public class CheckerHealthController {
     @Autowired
     private DefaultDelayPingActionCollector defaultDelayPingActionCollector;
 
-    @Autowired
-    private DefaultPsubPingActionCollector defaultPsubPingActionCollector;
-
     @Autowired
     private RedisUsedMemoryCollector redisUsedMemoryCollector;
 
@@ -61,12 +57,6 @@ public HEALTH_STATE getHealthState(@PathVariable String ip, @PathVariable int po
         else return HEALTH_STATE.UNKNOWN;
     }
 
-    @RequestMapping(value = "/health/cross/region/{ip}/{port}", method = RequestMethod.GET)
-    public HEALTH_STATE getCrossRegionHealthState(@PathVariable String ip, @PathVariable int port) {
-        if (siteStability.isSiteStable()) return defaultPsubPingActionCollector.getHealthState(new HostPort(ip, port));
-        else return HEALTH_STATE.UNKNOWN;
-    }
-
     @RequestMapping(value = "/health/check/instance/{ip}/{port}", method = RequestMethod.GET)
     public String getHealthCheckInstance(@PathVariable String ip, @PathVariable int port) {
         RedisHealthCheckInstance instance = instanceManager.findRedisHealthCheckInstance(new HostPort(ip, port));
@@ -77,16 +67,6 @@ public String getHealthCheckInstance(@PathVariable String ip, @PathVariable int
         return Codec.DEFAULT.encode(model);
     }
 
-    @RequestMapping(value = "/health/check/cross/region//instance/{ip}/{port}", method = RequestMethod.GET)
-    public String getCrossRegionHealthCheckInstance(@PathVariable String ip, @PathVariable int port) {
-        RedisHealthCheckInstance instance = instanceManager.findRedisInstanceForPsubPingAction(new HostPort(ip, port));
-        if(instance == null) {
-            return "Not found";
-        }
-        HealthCheckInstanceModel model = buildHealthCheckInfo(instance);
-        return Codec.DEFAULT.encode(model);
-    }
-
     @RequestMapping(value = "/health/check/cluster/{clusterId}", method = RequestMethod.GET)
     public String getClusterHealthCheckInstance(@PathVariable String clusterId) {
         ClusterHealthCheckInstance instance = instanceManager.findClusterHealthCheckInstance(clusterId);
@@ -117,16 +97,6 @@ public String getHealthCheckRedisInstanceForAssignedAction(@PathVariable String
         return Codec.DEFAULT.encode(model);
     }
 
-    @RequestMapping(value = "/health/check/redis-for-ping-action/{ip}/{port}", method = RequestMethod.GET)
-    public String getHealthCheckRedisInstanceForPingAction(@PathVariable String ip, @PathVariable int port) {
-        RedisHealthCheckInstance instance = instanceManager.findRedisInstanceForPsubPingAction(new HostPort(ip, port));
-        if(instance == null) {
-            return "Not found";
-        }
-        HealthCheckInstanceModel model = buildHealthCheckInfo(instance);
-        return Codec.DEFAULT.encode(model);
-    }
-
     @RequestMapping(value = "/health/redis/info/{ip}/{port}", method = RequestMethod.GET)
     public ActionContextRetMessage<Map<String, String>> getRedisInfo(@PathVariable String ip, @PathVariable int port) {
         return ActionContextRetMessage.from(redisInfoManager.getInfoByHostPort(new HostPort(ip, port)));
@@ -143,12 +113,6 @@ public Map<HostPort, HealthStatusDesc> getAllHealthStatusDesc() {
         else return Collections.emptyMap();
     }
 
-    @GetMapping("/health/check/cross/region/status/all")
-    public Map<HostPort, HealthStatusDesc> getAllCrossRegionHealthStatusDesc() {
-        if (siteStability.isSiteStable()) return defaultPsubPingActionCollector.getAllHealthStatus();
-        else return Collections.emptyMap();
-    }
-
     @GetMapping("/health/keeper/status/all")
     public ConcurrentMap<String, Map<DcClusterShardKeeper, Long>> getAllKeeperFlows() {
         return keeperFlowCollector.getHostPort2InputFlow();

redis/redis-checker/src/main/java/com/ctrip/xpipe/redis/checker/healthcheck/HealthCheckInstanceManager.java

@@ -18,8 +18,6 @@ public interface HealthCheckInstanceManager {
 
     RedisHealthCheckInstance getOrCreateRedisInstanceForAssignedAction(RedisMeta redis);
 
-    RedisHealthCheckInstance getOrCreateRedisInstanceForPsubPingAction(RedisMeta redis);
-
     KeeperHealthCheckInstance getOrCreate(KeeperMeta keeper);
 
     ClusterHealthCheckInstance getOrCreate(ClusterMeta cluster);
@@ -28,8 +26,6 @@ public interface HealthCheckInstanceManager {
 
     RedisHealthCheckInstance findRedisInstanceForAssignedAction(HostPort hostPort);
 
-    RedisHealthCheckInstance findRedisInstanceForPsubPingAction(HostPort hostPort);
-
     KeeperHealthCheckInstance findKeeperHealthCheckInstance(HostPort hostPort);
 
     ClusterHealthCheckInstance findClusterHealthCheckInstance(String clusterId);
@@ -40,8 +36,6 @@ public interface HealthCheckInstanceManager {
 
     RedisHealthCheckInstance removeRedisInstanceForAssignedAction(HostPort hostPort);
 
-    RedisHealthCheckInstance removeRedisInstanceForPingAction(HostPort hostPort);
-
     ClusterHealthCheckInstance remove(String cluster);
 
     List<RedisHealthCheckInstance> getAllRedisInstance();