diff --git a/core/src/main/java/com/ctrip/xpipe/api/migration/OuterClientService.java b/core/src/main/java/com/ctrip/xpipe/api/migration/OuterClientService.java index ddb8b61b4..ab80f16a2 100644 --- a/core/src/main/java/com/ctrip/xpipe/api/migration/OuterClientService.java +++ b/core/src/main/java/com/ctrip/xpipe/api/migration/OuterClientService.java @@ -692,6 +692,12 @@ public com.ctrip.xpipe.cluster.ClusterType innerType() { public com.ctrip.xpipe.cluster.ClusterType innerType() { return com.ctrip.xpipe.cluster.ClusterType.CROSS_DC; } + }, + HETERO(6) { + @Override + public com.ctrip.xpipe.cluster.ClusterType innerType() { + return com.ctrip.xpipe.cluster.ClusterType.HETERO; + } }; private Integer intVal; diff --git a/redis/redis-console/src/main/java/com/ctrip/xpipe/redis/console/service/impl/DcClusterServiceImpl.java b/redis/redis-console/src/main/java/com/ctrip/xpipe/redis/console/service/impl/DcClusterServiceImpl.java index 03752250b..e4547b854 100644 --- a/redis/redis-console/src/main/java/com/ctrip/xpipe/redis/console/service/impl/DcClusterServiceImpl.java +++ b/redis/redis-console/src/main/java/com/ctrip/xpipe/redis/console/service/impl/DcClusterServiceImpl.java @@ -241,7 +241,9 @@ public DcClusterModel findDcClusterModelByClusterAndDc(String clusterName, Strin result.setShards(shardModelService.getAllShardModel(dcName, clusterName)); ClusterType azGroupType = azGroupClusterRepository.selectAzGroupTypeById(dcClusterTbl.getAzGroupClusterId()); - result.setAzGroupClusterType(azGroupType.name()); + if (azGroupType != null) { + result.setAzGroupClusterType(azGroupType.name()); + } if (azGroupType == ClusterType.SINGLE_DC) { result.setSources(sourceModelService.getAllSourceModels(dcName, clusterName)); } diff --git a/redis/redis-console/src/main/resources/static/scripts/ClusterType.ts b/redis/redis-console/src/main/resources/static/scripts/ClusterType.ts index 2193c6bc9..c2cb50104 100644 --- a/redis/redis-console/src/main/resources/static/scripts/ClusterType.ts +++ b/redis/redis-console/src/main/resources/static/scripts/ClusterType.ts @@ -67,7 +67,7 @@ function ClusterType() { useKeeper: true, healthCheck: true, supportMigration: true, - isCrossDc:true, + isCrossDc:false, supportApplier:false, useAzGroupType:true, }