diff --git a/backend/src/main/java/io/metersphere/performance/engine/docker/DockerTestEngine.java b/backend/src/main/java/io/metersphere/performance/engine/docker/DockerTestEngine.java index 360a052749..c58107318f 100644 --- a/backend/src/main/java/io/metersphere/performance/engine/docker/DockerTestEngine.java +++ b/backend/src/main/java/io/metersphere/performance/engine/docker/DockerTestEngine.java @@ -6,6 +6,7 @@ import io.metersphere.base.domain.TestResource; import io.metersphere.commons.constants.ResourceStatusEnum; import io.metersphere.commons.exception.MSException; import io.metersphere.commons.utils.CommonBeanFactory; +import io.metersphere.config.JmeterProperties; import io.metersphere.config.KafkaProperties; import io.metersphere.controller.ResultHolder; import io.metersphere.dto.BaseSystemConfigDTO; @@ -70,6 +71,7 @@ public class DockerTestEngine extends AbstractEngine { BaseSystemConfigDTO baseInfo = CommonBeanFactory.getBean(SystemParameterService.class).getBaseInfo(); KafkaProperties kafkaProperties = CommonBeanFactory.getBean(KafkaProperties.class); + JmeterProperties jmeterProperties = CommonBeanFactory.getBean(JmeterProperties.class); String metersphereUrl = "http://localhost:8081"; if (baseInfo != null) { metersphereUrl = baseInfo.getUrl(); @@ -86,6 +88,7 @@ public class DockerTestEngine extends AbstractEngine { env.put("LOG_TOPIC", kafkaProperties.getLog().getTopic()); env.put("RESOURCE_ID", resource.getId()); env.put("THREAD_NUM", "" + threadNum); + env.put("HEAP", jmeterProperties.getHeap()); StartTestRequest startTestRequest = new StartTestRequest(); diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack index fece9598da..6269b43749 160000 --- a/backend/src/main/java/io/metersphere/xpack +++ b/backend/src/main/java/io/metersphere/xpack @@ -1 +1 @@ -Subproject commit fece9598da37b1737ca285d41f1f517c70035246 +Subproject commit 6269b43749e4f6485be5429350c1e3101b2c53cf