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

refactor(性能测试): 资源池增加配置gc和heap的选项

This commit is contained in:
Captain.B 2021-02-25 11:33:30 +08:00
parent 072792eb8b
commit 9cd635dcb2
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/performance/engine/docker/DockerTestEngine.java
View File

@ -7,7 +7,6 @@ import io.metersphere.commons.constants.ResourceStatusEnum;
import io.metersphere.commons.exception.MSException; import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.utils.CommonBeanFactory; import io.metersphere.commons.utils.CommonBeanFactory;
import io.metersphere.commons.utils.UrlTestUtils; import io.metersphere.commons.utils.UrlTestUtils;
import io.metersphere.config.JmeterProperties;
import io.metersphere.config.KafkaProperties; import io.metersphere.config.KafkaProperties;
import io.metersphere.controller.ResultHolder; import io.metersphere.controller.ResultHolder;
import io.metersphere.dto.BaseSystemConfigDTO; import io.metersphere.dto.BaseSystemConfigDTO;
@ -73,7 +72,6 @@ public class DockerTestEngine extends AbstractEngine {
BaseSystemConfigDTO baseInfo = CommonBeanFactory.getBean(SystemParameterService.class).getBaseInfo(); BaseSystemConfigDTO baseInfo = CommonBeanFactory.getBean(SystemParameterService.class).getBaseInfo();
KafkaProperties kafkaProperties = CommonBeanFactory.getBean(KafkaProperties.class); KafkaProperties kafkaProperties = CommonBeanFactory.getBean(KafkaProperties.class);
JmeterProperties jmeterProperties = CommonBeanFactory.getBean(JmeterProperties.class);
String metersphereUrl = "http://localhost:8081"; // 占位符 String metersphereUrl = "http://localhost:8081"; // 占位符
if (baseInfo != null) { if (baseInfo != null) {
metersphereUrl = baseInfo.getUrl(); metersphereUrl = baseInfo.getUrl();

2
backend/src/main/java/io/metersphere/xpack

@ -1 +1 @@
Subproject commit 5821a82acc56ee215c3587c35f0a71c1ed38efe9 Subproject commit e6af25ffb8cabdfc2de5ae07cb04492cc78345f3