Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bugfix/fix console portal npe&add credis hetero type #741

Merged
merged 1 commit into from
Nov 9, 2023
Merged

bugfix/fix console portal npe&add credis hetero type #741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions core/src/main/java/com/ctrip/xpipe/api/migration/OuterClientService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 3 additions & 1 deletion ...onsole/src/main/java/com/ctrip/xpipe/redis/console/service/impl/DcClusterServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down
2 changes: 1 addition & 1 deletion redis/redis-console/src/main/resources/static/dist/bundle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8962,7 +8962,7 @@ eval("angular\n .module('utils')\n .service('AppUtil', AppUtil);\nAppUtil.
\********************************/
/***/ (() => {

eval("angular\n .module('cluster_type')\n .service('ClusterType', ClusterType);\nfunction ClusterType() {\n return {\n _values: {\n 'one_way': {\n name: '单向同步',\n value: 'one_way',\n multiActiveDcs: false,\n useKeeper: true,\n healthCheck: true,\n supportMigration: true,\n isCrossDc: false,\n supportApplier: false,\n useAzGroupType: false,\n },\n 'bi_direction': {\n name: '双向同步',\n value: 'bi_direction',\n multiActiveDcs: true,\n useKeeper: false,\n healthCheck: true,\n supportMigration: false,\n isCrossDc: false,\n supportApplier: false,\n useAzGroupType: false,\n },\n 'single_dc': {\n name: '单机房缓存',\n value: 'single_dc',\n multiActiveDcs: false,\n useKeeper: false,\n healthCheck: false,\n supportMigration: false,\n isCrossDc: false,\n supportApplier: false,\n useAzGroupType: false,\n },\n 'local_dc': {\n name: '本机房缓存',\n value: 'local_dc',\n multiActiveDcs: true,\n useKeeper: false,\n healthCheck: false,\n supportMigration: false,\n isCrossDc: false,\n supportApplier: false,\n useAzGroupType: false,\n },\n 'cross_dc': {\n name: '跨机房缓存',\n value: 'cross_dc',\n multiActiveDcs: true,\n useKeeper: false,\n healthCheck: false,\n supportMigration: false,\n isCrossDc: true,\n supportApplier: false,\n useAzGroupType: false,\n },\n 'hetero': {\n name: '异构',\n value: 'hetero',\n multiActiveDcs: false,\n useKeeper: true,\n healthCheck: true,\n supportMigration: true,\n isCrossDc: true,\n supportApplier: false,\n useAzGroupType: true,\n }\n },\n lookup: function (typeName) {\n return (typeName && this._values[typeName.toLowerCase()]) || null;\n },\n values: function () {\n return Object.values(this._values);\n },\n selectData: function () {\n var data = [{ id: \"\", title: \"\" }];\n for (var key in this._values) {\n data.push({\n id: this._values[key].value,\n title: this._values[key].name\n });\n }\n return data;\n },\n default: function () {\n return this._values.one_way;\n }\n };\n}\n\n\n//# sourceURL=webpack://XPipe-Console/./scripts/ClusterType.ts?");
eval("angular\n .module('cluster_type')\n .service('ClusterType', ClusterType);\nfunction ClusterType() {\n return {\n _values: {\n 'one_way': {\n name: '单向同步',\n value: 'one_way',\n multiActiveDcs: false,\n useKeeper: true,\n healthCheck: true,\n supportMigration: true,\n isCrossDc: false,\n supportApplier: false,\n useAzGroupType: false,\n },\n 'bi_direction': {\n name: '双向同步',\n value: 'bi_direction',\n multiActiveDcs: true,\n useKeeper: false,\n healthCheck: true,\n supportMigration: false,\n isCrossDc: false,\n supportApplier: false,\n useAzGroupType: false,\n },\n 'single_dc': {\n name: '单机房缓存',\n value: 'single_dc',\n multiActiveDcs: false,\n useKeeper: false,\n healthCheck: false,\n supportMigration: false,\n isCrossDc: false,\n supportApplier: false,\n useAzGroupType: false,\n },\n 'local_dc': {\n name: '本机房缓存',\n value: 'local_dc',\n multiActiveDcs: true,\n useKeeper: false,\n healthCheck: false,\n supportMigration: false,\n isCrossDc: false,\n supportApplier: false,\n useAzGroupType: false,\n },\n 'cross_dc': {\n name: '跨机房缓存',\n value: 'cross_dc',\n multiActiveDcs: true,\n useKeeper: false,\n healthCheck: false,\n supportMigration: false,\n isCrossDc: true,\n supportApplier: false,\n useAzGroupType: false,\n },\n 'hetero': {\n name: '异构',\n value: 'hetero',\n multiActiveDcs: false,\n useKeeper: true,\n healthCheck: true,\n supportMigration: true,\n isCrossDc: false,\n supportApplier: false,\n useAzGroupType: true,\n }\n },\n lookup: function (typeName) {\n return (typeName && this._values[typeName.toLowerCase()]) || null;\n },\n values: function () {\n return Object.values(this._values);\n },\n selectData: function () {\n var data = [{ id: \"\", title: \"\" }];\n for (var key in this._values) {\n data.push({\n id: this._values[key].value,\n title: this._values[key].name\n });\n }\n return data;\n },\n default: function () {\n return this._values.one_way;\n }\n };\n}\n\n\n//# sourceURL=webpack://XPipe-Console/./scripts/ClusterType.ts?");

/***/ }),

Expand Down
2 changes: 1 addition & 1 deletion redis/redis-console/src/main/resources/static/scripts/ClusterType.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ function ClusterType() {
useKeeper: true,
healthCheck: true,
supportMigration: true,
isCrossDc:true,
isCrossDc:false,
supportApplier:false,
useAzGroupType:true,
}
Expand Down
Loading