diff --git a/component/DevKitTester/JFRParser/src/main/java/com/huawei/devkit/pipeline/bo/MemInfo.java b/component/DevKitTester/JFRParser/src/main/java/com/huawei/devkit/pipeline/bo/MemInfo.java index 2287cb85bc40e80a77bc8fe9e75d6929880b0b27..2185d88d70ba8a3488f37c6bf18a4ba2419222f7 100644 --- a/component/DevKitTester/JFRParser/src/main/java/com/huawei/devkit/pipeline/bo/MemInfo.java +++ b/component/DevKitTester/JFRParser/src/main/java/com/huawei/devkit/pipeline/bo/MemInfo.java @@ -1,5 +1,6 @@ package com.huawei.devkit.pipeline.bo; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; public class MemInfo { @@ -7,7 +8,7 @@ public class MemInfo { private long startTime; @JsonProperty("c") private Long committedSize; - @JsonProperty("r") + @JsonIgnore private Long reservedSize; @JsonProperty("u") private Long heapUsed; diff --git a/component/DevKitTester/devkit_tester/config/perf_report.html b/component/DevKitTester/devkit_tester/config/perf_report.html index d7dbf48a3aac8bc5b22a166bc1312b43dea040b6..605c97734dcd4280baa81a7a06e6314604541ae5 100644 --- a/component/DevKitTester/devkit_tester/config/perf_report.html +++ b/component/DevKitTester/devkit_tester/config/perf_report.html @@ -130,7 +130,7 @@ @@ -147,7 +147,7 @@ @@ -361,7 +361,15 @@ const getTopN = (data, topN) => { const idxArr = [...Array(data.length).keys()] - return idxArr.sort((a, b) => data[b] - data[a]).slice(0, topN); + return idxArr.sort((a, b) => { + if (data[a] === null||data[a] === undefined) { + return 1; + } else if (data[a] === null || data[a] === undefined) { + return -1; + } else { + return data[b] - data[a]; + } + }).slice(0, topN); } const topN = 10; @@ -479,7 +487,7 @@ class FlameData { } const rc = carr.join(' '); const factor = relation === 0 ? 20 : 50; - const fillOpacity = Math.max(0.35, Math.min(1-Math.abs(fd-d)/factor, 1)); + const fillOpacity = relation === 0 ? 0.3 : Math.max(0.35, Math.min(1-Math.abs(fd-d)/factor, 1)); const strokeOpacity = Math.sqrt(fillOpacity); const rt = `${v}, ${name.replace(/</g, '<')}, ${(vr*100).toFixed(2)}%`; if(width < TEXT_LIMIT) { @@ -559,6 +567,13 @@ class FlameData { memoryPids, cpuNodes, cpuPids, + nodeNameMap:{ + "committedSize":"提交堆内存", + "heapUsed":"已用堆内存", + "jvmUser":"JVM用户态", + "jvmSystem":"JVM内核态", + "machineTotal":"系统总使用率", + } }; }, mounted() { @@ -681,7 +696,7 @@ class FlameData { if (seriesPidKey[param.seriesIndex] === undefined) { return ''; } - return `${param.marker} [${seriesPidKey[param.seriesIndex]}] ${param.seriesName}  ${param.value} MB
`; + return `${param.marker} [${seriesPidKey[param.seriesIndex]}] ${param.seriesName}  ${param.value===null||param.value===undefined?"--":param.value+" MB"}
`; }).join('')), }, legend: {top: 40, itemStyle: {color: 'black'}, lineStyle: {color: 'black'}}, @@ -719,8 +734,8 @@ class FlameData { } ], series: seriesKey.map((key, innerIdx) => ({ - data: seriesData[innerIdx].map((val => (val/1024/1024).toFixed(2))), - name: key, + data: seriesData[innerIdx].map((val => val?(val/1024/1024).toFixed(2):val)), + name: this.nodeNameMap[key], type: 'line', emphasis: { focus: 'series', @@ -764,7 +779,7 @@ class FlameData { axisPointer: { type: 'shadow' }, - formatter: (params) => (params.map((param,idx) => `${param.marker} [${seriesPidKey[param.seriesIndex]}] ${param.seriesName}  ${param.value}%
`).join('')) + formatter: (params) => (params.map((param,idx) => `${param.marker} [${seriesPidKey[param.seriesIndex]}] ${param.seriesName}  ${param.value===null||param.value===undefined?"--":param.value+"%"}
`).join('')) }, legend: {top: 40, itemStyle: {color: 'black'}, lineStyle: {color: 'black'}}, dataZoom: [{type: 'slider', start: 0, end: 50 / ts.length * 100, top: 0},{type: 'inside', start: 0, end: 50 / ts.length * 100}], @@ -801,8 +816,8 @@ class FlameData { } ], series: seriesKey.map((key, innerIdx) => ({ - data: seriesData[innerIdx].map((val => (val*100).toFixed(2))), - name: key, + data: seriesData[innerIdx].map((val => val?(val*100).toFixed(2):val)), + name: this.nodeNameMap[key], type: 'line', emphasis: { focus: 'series', @@ -901,7 +916,7 @@ class FlameData { if (seriesPidKey[param.seriesIndex] === undefined) { return ''; } - return `${param.marker} [${seriesPidKey[param.seriesIndex]}] ${param.seriesName}  ${param.value} MB
`; + return `${param.marker} [${seriesPidKey[param.seriesIndex]}] ${param.seriesName}  ${param.value===null||param.value===undefined ? "--" :param.value + " MB" }
`; }).join('')), }, legend: {top: 40, itemStyle: {color: 'black'}, lineStyle: {color: 'black'}}, @@ -939,8 +954,8 @@ class FlameData { } ], series: seriesKey.map((key, innerIdx) => ({ - data: seriesData[innerIdx].map((val => (val/1024/1024).toFixed(2))), - name: key, + data: seriesData[innerIdx].map((val => val?(val/1024/1024).toFixed(2):val)), + name: this.nodeNameMap[key], type: 'line', emphasis: { focus: 'series', @@ -992,7 +1007,7 @@ class FlameData { axisPointer: { type: 'shadow' }, - formatter: (params) => (params.map((param,idx) => `${param.marker} [${seriesPidKey[param.seriesIndex]}] ${param.seriesName}  ${param.value}%
`).join('')) + formatter: (params) => (params.map((param,idx) => `${param.marker} [${seriesPidKey[param.seriesIndex]}] ${param.seriesName}  ${param.value===null||param.value===undefined?"--":param.value+"%"}
`).join('')) }, legend: {top: 40, itemStyle: {color: 'black'}, lineStyle: {color: 'black'}}, dataZoom: [{type: 'slider', start: 0, end: 50 / ts.length * 100, top: 0},{type: 'inside', start: 0, end: 50 / ts.length * 100}], @@ -1029,8 +1044,8 @@ class FlameData { } ], series: seriesKey.map((key, innerIdx) => ({ - data: seriesData[innerIdx].map((val => (val*100).toFixed(2))), - name: key, + data: seriesData[innerIdx].map((val => val?(val*100).toFixed(2):val)), + name: this.nodeNameMap[key], type: 'line', emphasis: { focus: 'series', diff --git a/tools/download_and_deploy/config/machine.yaml b/tools/download_and_deploy/config/machine.yaml index b5d24a5d07b2ee3f8ee8c1494f61e9505e3c0d23..78b77653c6ff78d9b1ae534d4d5ea38a8f920d57 100644 --- a/tools/download_and_deploy/config/machine.yaml +++ b/tools/download_and_deploy/config/machine.yaml @@ -16,6 +16,8 @@ executor: - 192.168.0.1 compatibility: - 192.168.0.1 +tester: + - 192.168.0.1 devkit: - 192.168.0.3 clamav: diff --git a/tools/download_and_deploy/src/constant.py b/tools/download_and_deploy/src/constant.py index 96edcdad6ba1f772b579c689968fd62ddb84059a..212e795d2376b3d579347a843b4110ba08ce6b8a 100644 --- a/tools/download_and_deploy/src/constant.py +++ b/tools/download_and_deploy/src/constant.py @@ -43,9 +43,7 @@ ROLE_COMPONENT = { JAVA_BUILDER_JDK17: ["BiShengJDK17"], EXECUTOR: ["CompatibilityTesting"], COMPATIBILITY: ["CompatibilityTesting"], - TESTER: [ - # "DevKitTester" - ], + TESTER: ["DevKitTester"], DEVKIT: ["DevKitWeb"], CLAMAV: ["ClamAV"], } diff --git a/tools/download_and_deploy/src/download/download_config.py b/tools/download_and_deploy/src/download/download_config.py index cc1c7f69f53631221b1e127573c7b0a76764526e..190ac25b826a10230340a46040105aeb6b7e054b 100644 --- a/tools/download_and_deploy/src/download/download_config.py +++ b/tools/download_and_deploy/src/download/download_config.py @@ -21,19 +21,19 @@ BiShengJDK17 = { CompatibilityTesting = { "component_name": "CompatibilityTesting", - "file": "https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.0.1/compatibility_testing.tar.gz", + "file": "https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.0.2-beta/compatibility_testing.tar.gz", "file_size": "76451308", } DevKitTester = { "component_name": "DevKitTester", - "file": "https://gitee.com/bdgl/devkit-pipeline/releases/download/compatibility_testing-v1.2/devkit_tester.tar.gz", - "file_size": "33426960", + "file": "https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.0.2-beta/devkit_tester.tar.gz", + "file_size": "36151864", } A_FOT = { "component_name": "A-FOT", - "file": "https://gitee.com/openeuler/devkit-pipeline/releases/download/v0.2/a-fot.tar.gz", + "file": "https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.0.2-beta/a-fot.tar.gz", "file_size": "15740", }