test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(性能测试): 计算预计执行时间

This commit is contained in:
Captain.B 2021-04-02 10:15:45 +08:00 committed by 刘瑞斌
parent 7b1ad66eb4
commit dac8e8fbfc
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java
View File

@ -586,7 +586,7 @@ public class JmeterDocumentParser implements DocumentParser {
collectionProp.appendChild(createKafkaProp(document, "test.name", context.getTestName())); collectionProp.appendChild(createKafkaProp(document, "test.name", context.getTestName()));
collectionProp.appendChild(createKafkaProp(document, "test.startTime", context.getStartTime().toString())); collectionProp.appendChild(createKafkaProp(document, "test.startTime", context.getStartTime().toString()));
collectionProp.appendChild(createKafkaProp(document, "test.reportId", context.getReportId())); collectionProp.appendChild(createKafkaProp(document, "test.reportId", context.getReportId()));
collectionProp.appendChild(createKafkaProp(document, "test.expectedEndTime", (String) context.getProperty("expectedEndTime"))); collectionProp.appendChild(createKafkaProp(document, "test.expectedDuration", (String) context.getProperty("expectedDuration")));
collectionProp.appendChild(createKafkaProp(document, "test.expectedDelayEndTime", kafkaProperties.getExpectedDelayEndTime())); // 30s collectionProp.appendChild(createKafkaProp(document, "test.expectedDelayEndTime", kafkaProperties.getExpectedDelayEndTime())); // 30s
elementProp.appendChild(collectionProp); elementProp.appendChild(collectionProp);
@ -730,7 +730,7 @@ public class JmeterDocumentParser implements DocumentParser {
break; break;
} }
// 处理预计结束时间 // 处理预计结束时间
processExpectedEndTime(duration); processExpectedDuration(duration);
threadGroup.setAttribute("enabled", enabled); threadGroup.setAttribute("enabled", enabled);
if (BooleanUtils.toBoolean(deleted)) { if (BooleanUtils.toBoolean(deleted)) {
@ -847,7 +847,7 @@ public class JmeterDocumentParser implements DocumentParser {
break; break;
} }
// 处理预计结束时间 // 处理预计结束时间
processExpectedEndTime(duration); processExpectedDuration(duration);
threadGroup.setAttribute("enabled", enabled); threadGroup.setAttribute("enabled", enabled);
if (BooleanUtils.toBoolean(deleted)) { if (BooleanUtils.toBoolean(deleted)) {
@ -868,23 +868,22 @@ public class JmeterDocumentParser implements DocumentParser {
threadGroup.appendChild(createStringProp(document, "Unit", "S")); threadGroup.appendChild(createStringProp(document, "Unit", "S"));
} }
private void processExpectedEndTime(String duration) { private void processExpectedDuration(String duration) {
long startTime = context.getStartTime();
Long d = Long.parseLong(duration); Long d = Long.parseLong(duration);
Object serialize = context.getProperty("TestPlan.serialize_threadgroups"); Object serialize = context.getProperty("TestPlan.serialize_threadgroups");
String expectedEndTime = (String) context.getProperty("expectedEndTime"); String expectedDuration = (String) context.getProperty("expectedDuration");
if (StringUtils.isBlank(expectedEndTime)) { if (StringUtils.isBlank(expectedDuration)) {
expectedEndTime = startTime + ""; expectedDuration = "0";
} }
long endTime = Long.parseLong(expectedEndTime); long durationTime = Long.parseLong(expectedDuration);
if (BooleanUtils.toBoolean((String) serialize)) { if (BooleanUtils.toBoolean((String) serialize)) {
// 顺序执行线程组 // 顺序执行线程组
context.addProperty("expectedEndTime", String.valueOf(endTime + d * 1000)); context.addProperty("expectedDuration", String.valueOf(durationTime + d * 1000));
} else { } else {
// 同时执行线程组 // 同时执行线程组
if (endTime < startTime + d * 1000) { if (durationTime < d * 1000) {
context.addProperty("expectedEndTime", String.valueOf(startTime + d * 1000)); context.addProperty("expectedDuration", String.valueOf(d * 1000));
} }
} }
} }
@ -960,7 +959,7 @@ public class JmeterDocumentParser implements DocumentParser {
// 处理预计结束时间， (按照迭代次数 * 线程数)s // 处理预计结束时间， (按照迭代次数 * 线程数)s
String duration = String.valueOf(Long.parseLong(loops) * Long.parseLong(threads)); String duration = String.valueOf(Long.parseLong(loops) * Long.parseLong(threads));
processExpectedEndTime(duration); processExpectedDuration(duration);
} }
private void processCheckoutTimer(Element element) { private void processCheckoutTimer(Element element) {