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

fix(测试计划) 修复并发执行问题 

--bug=1006849 --user=赵勇 【测试计划】-批量执行接口用例失败 https://www.tapd.cn/55049933/s/1049783
This commit is contained in:
fit2-zhao 2021-09-22 20:21:55 +08:00 committed by fit2-zhao
parent e99a3ecb11
commit 49c1bd8816
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/src/main/java/io/metersphere/api/jmeter/LocalRunner.java
View File

@ -1,6 +1,7 @@
package io.metersphere.api.jmeter; package io.metersphere.api.jmeter;
import io.metersphere.commons.utils.LogUtil; import io.metersphere.commons.utils.LogUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.jmeter.engine.JMeterEngineException; import org.apache.jmeter.engine.JMeterEngineException;
import org.apache.jmeter.engine.StandardJMeterEngine; import org.apache.jmeter.engine.StandardJMeterEngine;
import org.apache.jorphan.collections.HashTree; import org.apache.jorphan.collections.HashTree;
@ -20,7 +21,9 @@ public class LocalRunner {
engine.configure(jmxTree); engine.configure(jmxTree);
try { try {
engine.runTest(); engine.runTest();
MessageCache.runningEngine.put(report, engine); if (StringUtils.isNotEmpty(report)) {
MessageCache.runningEngine.put(report, engine);
}
} catch (JMeterEngineException e) { } catch (JMeterEngineException e) {
engine.stopTest(true); engine.stopTest(true);
} }
@ -29,7 +32,7 @@ public class LocalRunner {
public void stop(String report) { public void stop(String report) {
try { try {
StandardJMeterEngine engine = MessageCache.runningEngine.get(report); StandardJMeterEngine engine = MessageCache.runningEngine.get(report);
if (engine != null) { if (engine != null && StringUtils.isNotEmpty(report)) {
engine.stopTest(); engine.stopTest();
MessageCache.runningEngine.remove(report); MessageCache.runningEngine.remove(report);
} }

4
backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java
View File

@ -480,9 +480,9 @@ public class TestPlanApiCaseService {
ApiDefinitionExecResult report = addResult(request, key, APITestStatus.Running.name(), batchMapper); ApiDefinitionExecResult report = addResult(request, key, APITestStatus.Running.name(), batchMapper);
modeDataDTO.setApiCaseId(report.getId()); modeDataDTO.setApiCaseId(report.getId());
if (request.getConfig() != null && StringUtils.isNotEmpty(request.getConfig().getResourcePoolId())) { if (request.getConfig() != null && StringUtils.isNotEmpty(request.getConfig().getResourcePoolId())) {
jMeterService.runTest(modeDataDTO.getTestId(), modeDataDTO.getApiCaseId(), ApiRunMode.API_PLAN.name(), null, request.getConfig()); jMeterService.runTest(report.getId(), modeDataDTO.getApiCaseId(), ApiRunMode.API_PLAN.name(), null, request.getConfig());
} else { } else {
jMeterService.runLocal(modeDataDTO.getTestId(), modeDataDTO.getHashTree(), TriggerMode.BATCH.name() , ApiRunMode.API_PLAN.name()); jMeterService.runLocal(report.getId(), modeDataDTO.getHashTree(), TriggerMode.BATCH.name() , ApiRunMode.API_PLAN.name());
} }
} }
sqlSession.flushStatements(); sqlSession.flushStatements();