refactor(性能测试): 优化性能测试中对于资源池的监控

framework/sdk-parent/frontend/src/components/resource-pool/NodeOperationLabel.vue

@@ -1,14 +1,20 @@
 <template>
   <div>
-    <span :class="labelClassName" :title="nodeName" >{{nodeName}}</span>
+    <span :class="labelClassName" :title="nodeName">{{ nodeName }}</span>
-    <el-tag size="mini" v-if="nodeOperationInfo!== undefined && nodeOperationInfo.runningTask>0" style="color:#E5594B;background-color: #FFFFFF;border-color: #E5594B;margin-left: 5px;margin-right: 5px">
+    <el-tag v-if="nodeOperationInfo!== undefined && nodeOperationInfo.runningTask>0" size="mini"
-      {{$t("commons.running")}}</el-tag>
+            style="color:#E5594B;background-color: #FFFFFF;border-color: #E5594B;margin-left: 5px;margin-right: 5px">
-    <el-tag size="mini" v-else-if="nodeOperationInfo!== undefined" style="color:#89DB7E;background-color: #FFFFFF;border-color: #89DB7E;margin-left: 5px;margin-right: 5px">
+      {{ $t("commons.running") }}
-      {{$t("commons.idle")}}</el-tag>
+    </el-tag>
-    <span v-if="nodeOperationInfo!== undefined && nodeOperationInfo.runningTask>0" style="color:#A9A9A9">
+    <el-tag v-else-if="nodeOperationInfo!== undefined" size="mini"
-      {{" CPU:"+nodeOperationInfo.cpuUsage}}</span>
+            style="color:#89DB7E;background-color: #FFFFFF;border-color: #89DB7E;margin-left: 5px;margin-right: 5px">
-    <span v-if="nodeOperationInfo!== undefined " style="color:#A9A9A9;">
+      {{ $t("commons.idle") }}
-      {{" CPU:"+nodeOperationInfo.cpuUsage}}</span>
+    </el-tag>
+    <span
+        v-if="nodeOperationInfo!== undefined && nodeOperationInfo.runningTask>0 && nodeOperationInfo.cpuUsage!== undefined"
+        style="color:#A9A9A9">
+      {{ " CPU:" + nodeOperationInfo.cpuUsage }}</span>
+    <span v-if="nodeOperationInfo!== undefined && nodeOperationInfo.cpuUsage!== undefined" style="color:#A9A9A9;">
+      {{ " CPU:" + nodeOperationInfo.cpuUsage }}</span>
   </div>
 </template>
 
@@ -17,7 +23,7 @@ export default {
   name: "NodeOperationLabel",
   props: {
     nodeName: String,
-    nodeOperationInfo:Object,
+    nodeOperationInfo: Object,
     labelClassName: {
       type: String,
       default: "node-label"
@@ -29,19 +35,17 @@ export default {
       defaultInitOptions: this.initOptions
     };
   },
-  computed: {
+  computed: {},
-  },
   mounted() {
   },
-  methods: {
+  methods: {}
-  }
 };
 </script>
 
 <style scoped>
-.node-label{
+.node-label {
   display: inline-flex;
-  width:240px;
+  width: 240px;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;

framework/sdk-parent/sdk/src/main/java/io/metersphere/dto/ResourcePoolOperationInfo.java

@@ -8,15 +8,17 @@ import java.util.Map;
 
 @Data
 public class ResourcePoolOperationInfo {
+    Map<String, NodeOperationInfo> nodeOperationInfos = new HashMap<>();
     private String id;
     private String cpuUsage;
     private int runningTask = 0;
-    Map<String, NodeOperationInfo> nodeOperationInfos = new HashMap<>();
 
     public void addNodeOperationInfo(String taskResourceId, String ip, String port, String cpuUsage, int runningTask) {
-        if(StringUtils.isBlank(cpuUsage)) {
+        if (StringUtils.isBlank(cpuUsage) && runningTask < 0) {
-            //节点下如果获取不到cpu使用率，判断为没有查询到该节点的数据。
+            //节点下如果获取不到cpu使用率，且没有查到runningTask数据，判断为没有查询到该节点的数据。
             return;
+        } else if (StringUtils.isBlank(cpuUsage)) {
+            cpuUsage = "NONE";
         }
         NodeOperationInfo nodeOperationInfo = new NodeOperationInfo();
         nodeOperationInfo.setIp(ip);
@@ -30,7 +32,7 @@ public class ResourcePoolOperationInfo {
 
         if (nodeOperationInfos.size() > 1) {
             //多节点的情况下暂不处理CPU使用率
-            this.cpuUsage = null;
+            this.cpuUsage = "NONE";
         }
     }
 }

framework/sdk-parent/sdk/src/main/java/io/metersphere/service/PrometheusService.java

@@ -78,29 +78,25 @@ public class PrometheusService {
             ResourcePoolOperationInfo nodeOperationInfo = new ResourcePoolOperationInfo();
             nodeOperationInfo.setId(testResourcePoolDTO.getId());
 
-            boolean queryCpuUsage = true;
+            //如果没有在prometheus查到数据则runningTask为-1。
-            if (testResourcePoolDTO.getResources().size() > 1) {
-                queryCpuUsage = false;
-            }
-
-            String cpuUsage = null;
             int runningTask = -1;
 
             for (TestResource testResource : testResourcePoolDTO.getResources()) {
                 String config = testResource.getConfiguration();
+                try {
+                    //防止出现没有更新的node-controller引起报错，从而影响整个系统
                     if (StringUtils.isNotBlank(config)) {
+                        String cpuUsage = null;
                         Map<String, Object> configMap = JSON.parseObject(config, Map.class);
                         String ip = String.valueOf(configMap.get("ip"));
                         String port = String.valueOf(configMap.get("port"));
                         String nodeId = ip + ":" + port;
-                    if (queryCpuUsage) {
                         String cpuUsageQL = this.generatePromQL(new String[]{"system_cpu_usage"}, nodeId);
                         LogUtil.debug(host + "/api/v1/query?query=" + cpuUsageQL);
                         String cpuUsageDouble = this.runPromQL(headers, host, cpuUsageQL);
-                        if(StringUtils.isNotBlank(cpuUsageDouble)){
+                        if (StringUtils.isNotBlank(cpuUsageDouble)) {
                             cpuUsage = decimalFormat.format(Double.parseDouble(cpuUsageDouble) * 100) + "%";
                         }
-                    }
 
                         // 查询任务数
                         List<String> taskSeriesNames = new ArrayList<>() {{
@@ -110,10 +106,16 @@ public class PrometheusService {
                         String taskCountQL = this.generatePromQL(taskSeriesNames.toArray(new String[0]), nodeId);
                         String result = this.runPromQL(headers, host, taskCountQL);
                         if (StringUtils.isNotBlank(result)) {
+                            if (runningTask == -1) {
+                                runningTask = 0;
+                            }
                             runningTask += Integer.parseInt(result);
                         }
                         nodeOperationInfo.addNodeOperationInfo(String.valueOf(configMap.get("id")), ip, port, cpuUsage, runningTask);
                     }
+                } catch (Exception e) {
+                    LogUtil.error("查找node监控报错:" + testResourcePoolDTO.getName(), e);
+                }
             }
             if (MapUtils.isNotEmpty(nodeOperationInfo.getNodeOperationInfos())) {
                 returnList.add(nodeOperationInfo);