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:
fit2-zhao 2021-10-08 10:31:29 +08:00 committed by fit2-zhao
parent 1540e573ab
commit de641948ef
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
View File

@ -1238,12 +1238,19 @@ public class ApiAutomationService {
SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH); SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
ApiScenarioReportMapper batchMapper = sqlSession.getMapper(ApiScenarioReportMapper.class); ApiScenarioReportMapper batchMapper = sqlSession.getMapper(ApiScenarioReportMapper.class);
// 开始并发执行 // 开始并发执行
Thread thread = new Thread(new Runnable() {
@Override
public void run() {
for (String reportId : executeQueue.keySet()) { for (String reportId : executeQueue.keySet()) {
//存储报告 //存储报告
APIScenarioReportResult report = executeQueue.get(reportId).getReport(); APIScenarioReportResult report = executeQueue.get(reportId).getReport();
batchMapper.insert(report); batchMapper.insert(report);
} }
sqlSession.flushStatements(); sqlSession.flushStatements();
}
});
thread.start();
for (String reportId : executeQueue.keySet()) { for (String reportId : executeQueue.keySet()) {
if (request.getConfig() != null && StringUtils.isNotEmpty(request.getConfig().getResourcePoolId())) { if (request.getConfig() != null && StringUtils.isNotEmpty(request.getConfig().getResourcePoolId())) {
jMeterService.runTest(executeQueue.get(reportId).getTestId(), reportId, request.getRunMode(), request.getPlanScenarioId(), request.getConfig()); jMeterService.runTest(executeQueue.get(reportId).getTestId(), reportId, request.getRunMode(), request.getPlanScenarioId(), request.getConfig());

4
backend/src/main/java/io/metersphere/api/service/NodeKafkaService.java
View File

@ -56,8 +56,8 @@ public class NodeKafkaService {
config.getTestResources().remove(jvmInfoDTO); config.getTestResources().remove(jvmInfoDTO);
} }
String cUri = String.format(BASE_URL + "/consumer/create", nodeIp, port); //String cUri = String.format(BASE_URL + "/consumer/create", nodeIp, port);
restTemplate.postForEntity(cUri, consumerProps, void.class); //restTemplate.postForEntity(cUri, consumerProps, void.class);
} }
} catch (Exception e) { } catch (Exception e) {
LogUtil.error(e.getMessage()); LogUtil.error(e.getMessage());