replBacklogSize正确展示,loadingrdb状态正确展示

ctripcorp · Aug 8, 2024 · df15793 · df15793
1 parent 5032c49
commit df15793
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 18 deletions.
diff --git a/...ole/src/main/java/com/ctrip/xpipe/redis/console/service/impl/RedisSessionServiceImpl.java b/...ole/src/main/java/com/ctrip/xpipe/redis/console/service/impl/RedisSessionServiceImpl.java
@@ -11,18 +11,14 @@
 import com.ctrip.xpipe.redis.core.meta.MetaCache;
 import com.ctrip.xpipe.redis.core.protocal.pojo.AbstractRole;
 import com.ctrip.xpipe.redis.core.protocal.pojo.Role;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutionException;
+import java.util.concurrent.*;
 
 
 @Component
@@ -42,31 +38,32 @@ public CommandFuture<Role> getRedisRole(String ip, int port, RedisSession.RollCa
     @Override
     public List<RedisRoleModel> getShardAllRedisRole(String dcId, String clusterId, String shardId) {
         List<RedisMeta> redisOfDcClusterShard = metaCache.getRedisOfDcClusterShard(dcId, clusterId, shardId);
-        List<RedisRoleModel> models = new CopyOnWriteArrayList<>();
+        Map<HostPort, RedisRoleModel> models = new ConcurrentHashMap<>();
         Map<HostPort, CommandFuture<Role>> futureMap = new HashMap<>();
         redisOfDcClusterShard.forEach(redisMeta -> {
+            HostPort redis = new HostPort(redisMeta.getIp(), redisMeta.getPort());
             CommandFuture<Role> redisRole = getRedisRole(redisMeta.getIp(), redisMeta.getPort(), new RedisSession.RollCallback() {
                 @Override
                 public void role(String role, Role detail) {
-                    models.add(new RedisRoleModel(redisMeta.getIp(), redisMeta.getPort(), (AbstractRole) detail));
+                    models.put(redis, new RedisRoleModel(redisMeta.getIp(), redisMeta.getPort(), (AbstractRole) detail));
                 }
 
                 @Override
                 public void fail(Throwable e) {
-                    models.add(new RedisRoleModel(redisMeta.getIp(), redisMeta.getPort(),e));
+                    models.put(redis, new RedisRoleModel(redisMeta.getIp(), redisMeta.getPort(),e));
                 }
             });
-            futureMap.put(new HostPort(redisMeta.getIp(), redisMeta.getPort()), redisRole);
+            futureMap.put(redis, redisRole);
         });
 
         for (Map.Entry<HostPort, CommandFuture<Role>> entry : futureMap.entrySet()) {
             try {
                 entry.getValue().get();
             } catch (InterruptedException | ExecutionException e) {
-                models.add(new RedisRoleModel(entry.getKey().getHost(), entry.getKey().getPort(), e));
+                models.put(entry.getKey(), new RedisRoleModel(entry.getKey().getHost(), entry.getKey().getPort(), e));
             }
         }
-        return models;
+        return new ArrayList<>(models.values());
     }
 
 }
diff --git a/redis/redis-console/src/main/resources/static/dist/bundle.js b/redis/redis-console/src/main/resources/static/dist/bundle.js
@@ -9153,7 +9153,7 @@ eval("angular\n    .module('index')\n    .controller('DcListCtl', DcListCtl);\nD
   \*******************************************************/
 /***/ (() => {
 
-eval("angular\n    .module('index')\n    .controller('FullLinkHealthCheckCtl', FullLinkHealthCheckCtl)\n    .config(function ($mdThemingProvider) {\n    $mdThemingProvider.theme('green').backgroundPalette('light-green');\n    $mdThemingProvider.theme('red').backgroundPalette('red');\n    $mdThemingProvider.theme('orange').backgroundPalette('orange');\n});\nFullLinkHealthCheckCtl.$inject = ['$rootScope', '$scope', '$window', '$stateParams', 'HealthCheckService',\n    'toastr', 'NgTableParams', 'AppUtil', '$interval'];\nfunction FullLinkHealthCheckCtl($rootScope, $scope, $window, $stateParams, HealthCheckService, toastr, NgTableParams, $interval) {\n    $scope.masterRoles = [];\n    $scope.slaveRoles = [];\n    $scope.shardCheckerHealthCheckResult = [];\n    $scope.showActions = false;\n    $scope.shardAllMeta = null;\n    $scope.shardKeeperState = [];\n    $scope.redisRoleHealthCheck = redisRoleHealthCheck;\n    $scope.shardCheckerGroupHealthCheck = shardCheckerGroupHealthCheck;\n    $scope.doShowActions = doShowActions;\n    $scope.getShardAllMeta = getShardAllMeta;\n    $scope.getShardKeeperState = getShardKeeperState;\n    redisRoleHealthCheck();\n    shardCheckerGroupHealthCheck();\n    getShardAllMeta();\n    getShardKeeperState();\n    function redisRoleHealthCheck() {\n        HealthCheckService.getShardRedisRole($stateParams.currentDcName, $stateParams.clusterName, $stateParams.shardName).then(function (response) {\n            $scope.masterRoles = [];\n            $scope.slaveRoles = [];\n            response.forEach(function (item) {\n                if (item.role.serverRole == \"SLAVE\") {\n                    $scope.slaveRoles.push(item);\n                }\n                else {\n                    $scope.masterRoles.push(item);\n                }\n            });\n        });\n    }\n    function shardCheckerGroupHealthCheck() {\n        HealthCheckService.getShardCheckerHealthCheck($stateParams.currentDcName, $stateParams.clusterName, $stateParams.shardName).then(function (response) {\n            $scope.shardCheckerHealthCheckResult = [];\n            response.forEach(function (item) {\n                $scope.shardCheckerHealthCheckResult.push(item);\n            });\n        });\n    }\n    function getShardAllMeta() {\n        HealthCheckService.getShardAllMeta($stateParams.currentDcName, $stateParams.clusterName, $stateParams.shardName).then(function (response) {\n            $scope.shardAllMeta = null;\n            $scope.shardAllMeta = response;\n        });\n    }\n    function getShardKeeperState() {\n        HealthCheckService.getShardKeeperState($stateParams.currentDcName, $stateParams.clusterName, $stateParams.shardName).then(function (response) {\n            $scope.shardKeeperState = [];\n            response.forEach(function (item) {\n                $scope.shardKeeperState.push(item);\n            });\n        });\n    }\n    function doShowActions() {\n        $scope.showActions = !$scope.showActions;\n    }\n}\n\n\n//# sourceURL=webpack://XPipe-Console/./scripts/controllers/FullLinkHealthCheckCtl.ts?");
+eval("angular\n    .module('index')\n    .controller('FullLinkHealthCheckCtl', FullLinkHealthCheckCtl)\n    .config(function ($mdThemingProvider) {\n    $mdThemingProvider.theme('green').backgroundPalette('light-green');\n    $mdThemingProvider.theme('red').backgroundPalette('red');\n    $mdThemingProvider.theme('orange').backgroundPalette('orange');\n});\nFullLinkHealthCheckCtl.$inject = ['$rootScope', '$scope', '$window', '$stateParams', 'HealthCheckService',\n    'toastr', 'NgTableParams', 'AppUtil', '$interval'];\nfunction FullLinkHealthCheckCtl($rootScope, $scope, $window, $stateParams, HealthCheckService, toastr, NgTableParams, $interval) {\n    $scope.masterRoles = [];\n    $scope.slaveRoles = [];\n    $scope.unknownRoles = [];\n    $scope.shardCheckerHealthCheckResult = [];\n    $scope.showActions = false;\n    $scope.shardAllMeta = null;\n    $scope.shardKeeperState = [];\n    $scope.redisRoleHealthCheck = redisRoleHealthCheck;\n    $scope.shardCheckerGroupHealthCheck = shardCheckerGroupHealthCheck;\n    $scope.doShowActions = doShowActions;\n    $scope.getShardAllMeta = getShardAllMeta;\n    $scope.getShardKeeperState = getShardKeeperState;\n    redisRoleHealthCheck();\n    shardCheckerGroupHealthCheck();\n    getShardAllMeta();\n    getShardKeeperState();\n    function redisRoleHealthCheck() {\n        HealthCheckService.getShardRedisRole($stateParams.currentDcName, $stateParams.clusterName, $stateParams.shardName).then(function (response) {\n            $scope.masterRoles = [];\n            $scope.slaveRoles = [];\n            $scope.unknownRoles = [];\n            response.forEach(function (item) {\n                if (item.role == null) {\n                    $scope.unknownRoles.push(item);\n                }\n                else if (item.role.serverRole == \"SLAVE\") {\n                    $scope.slaveRoles.push(item);\n                }\n                else if (item.role.serverRole == \"MASTER\") {\n                    $scope.masterRoles.push(item);\n                }\n            });\n        });\n    }\n    function shardCheckerGroupHealthCheck() {\n        HealthCheckService.getShardCheckerHealthCheck($stateParams.currentDcName, $stateParams.clusterName, $stateParams.shardName).then(function (response) {\n            $scope.shardCheckerHealthCheckResult = [];\n            response.forEach(function (item) {\n                $scope.shardCheckerHealthCheckResult.push(item);\n            });\n        });\n    }\n    function getShardAllMeta() {\n        HealthCheckService.getShardAllMeta($stateParams.currentDcName, $stateParams.clusterName, $stateParams.shardName).then(function (response) {\n            $scope.shardAllMeta = null;\n            $scope.shardAllMeta = response;\n        });\n    }\n    function getShardKeeperState() {\n        HealthCheckService.getShardKeeperState($stateParams.currentDcName, $stateParams.clusterName, $stateParams.shardName).then(function (response) {\n            $scope.shardKeeperState = [];\n            response.forEach(function (item) {\n                $scope.shardKeeperState.push(item);\n            });\n        });\n    }\n    function doShowActions() {\n        $scope.showActions = !$scope.showActions;\n    }\n}\n\n\n//# sourceURL=webpack://XPipe-Console/./scripts/controllers/FullLinkHealthCheckCtl.ts?");
 
 /***/ }),
 

diff --git a/redis/redis-console/src/main/resources/static/scripts/controllers/FullLinkHealthCheckCtl.ts b/redis/redis-console/src/main/resources/static/scripts/controllers/FullLinkHealthCheckCtl.ts
@@ -14,6 +14,7 @@ function FullLinkHealthCheckCtl($rootScope, $scope, $window, $stateParams, Healt
                                    toastr, NgTableParams, $interval) {
     $scope.masterRoles = [];
     $scope.slaveRoles = [];
+    $scope.unknownRoles = [];
     $scope.shardCheckerHealthCheckResult = [];
     $scope.showActions=false;
     $scope.shardAllMeta = null;
@@ -34,10 +35,13 @@ function FullLinkHealthCheckCtl($rootScope, $scope, $window, $stateParams, Healt
         HealthCheckService.getShardRedisRole($stateParams.currentDcName, $stateParams.clusterName, $stateParams.shardName).then(function (response) {
             $scope.masterRoles = [];
             $scope.slaveRoles = [];
+            $scope.unknownRoles = [];
             response.forEach(function (item){
-                if (item.role.serverRole == "SLAVE") {
+                if (item.role == null) {
+                    $scope.unknownRoles.push(item)
+                }else if (item.role.serverRole == "SLAVE") {
                     $scope.slaveRoles.push(item);
-                } else {
+                } else if (item.role.serverRole == "MASTER") {
                     $scope.masterRoles.push(item);
                 }
             })

diff --git a/redis/redis-console/src/main/resources/static/views/index/full_link_health_check.html b/redis/redis-console/src/main/resources/static/views/index/full_link_health_check.html
@@ -20,7 +20,7 @@
                     <md-card md-theme="{{ master.err==null ? 'green' : 'red' }}" md-theme-watch>
                         <md-card-title class="custom-card">
                             <md-card-title-text class="centered-text">
-                                <div ng-show="showErrMsg" class="md-body-1" style="width: 100%; display: inline-block; word-break: break-all;">{{master.err}}</div>
+                                <div ng-show="showErrMsg" class="md-body-1" style="width: 100%; display: inline-block; word-break: break-all;">{{master.err.message}}</div>
                                 <div style="white-space: nowrap;">
                                     <span>{{master.host}}:{{master.port}}</span>
                                     <span style="margin-left: 20px;">{{master.role.serverRole}}</span>
@@ -48,7 +48,7 @@
                     <md-card md-theme="{{ slave.err!=null ? 'red' : (slave.role.masterState == 'REDIS_REPL_CONNECTED' ? 'green' : 'orange') }}" md-theme-watch>
                         <md-card-title class="custom-card">
                             <md-card-title-text class="centered-text">
-                                <div ng-show="showErrMsg" class="md-body-1" style="width: 100%; display: inline-block; word-break: break-all;">{{slave.err}}</div>
+                                <div ng-show="showErrMsg" class="md-body-1" style="width: 100%; display: inline-block; word-break: break-all;">{{slave.err.message}}</div>
                                 <div  style="white-space: nowrap;">
                                     <span>{{slave.host}}:{{slave.port}}</span>
                                     <span style="margin-left: 20px;">{{slave.role.serverRole}}</span>
@@ -68,6 +68,18 @@
                         </md-card-content>
                     </md-card>
                 </div>
+                <div ng-repeat="redis in unknownRoles">
+                    <md-card md-theme="orange" md-theme-watch>
+                        <md-card-title class="custom-card">
+                            <md-card-title-text class="centered-text">
+                                <div ng-show="showErrMsg" class="md-body-1" style="width: 100%; display: inline-block; word-break: break-all;">{{redis.err.message}}</div>
+                                <div  style="white-space: nowrap;">
+                                    <span>{{redis.host}}:{{redis.port}}</span>
+                                </div>
+                            </md-card-title-text>
+                        </md-card-title>
+                    </md-card>
+                </div>
             </md-card-content>
         </md-card>
         <!--Keeper-->
@@ -104,7 +116,7 @@
                             </div>
                             <div  style="white-space: nowrap;">
                                 <span>replBacklogSize:</span>
-                                <span style="margin-left: 20px;">{{keeper.replBacklogSize/1024/1024 | number:2}}G</span>
+                                <span style="margin-left: 20px;">{{keeper.replBacklogSize/1024/1024/1024 | number:2}}G</span>
                             </div>
                             <div ng-repeat="keeperSlave in keeper.slaves">
                                 <md-card md-theme="default" md-theme-watch>
@@ -172,7 +184,7 @@
         <md-card md-theme="{{ shardAllMeta != null && shardAllMeta.err == null ? 'green' : 'red' }}" md-theme-watch>
             <md-card-title class="custom-card">
                 <md-card-title-text class="centered-text">
-                    <div ng-show="showErrMsg" class="md-body-1" style="width: 100%; display: inline-block; word-break: break-all;">{{shardAllMeta.err}}</div>
+                    <div ng-show="showErrMsg" class="md-body-1" style="width: 100%; display: inline-block; word-break: break-all;">{{shardAllMeta.err.message}}</div>
                     <div class="md-headline" style="white-space: nowrap;">
                         <span class="md-headline">Meta</span>
                         <span style="margin-left: 20px;">{{shardAllMeta.metaHost}}:{{shardAllMeta.metaPort}}</span>