From fc660b6c2c30726f49717decd1b05ec628a4028e Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Mon, 21 Dec 2020 15:25:44 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=AE=BE=E7=BD=AE=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E6=B1=A0=EF=BC=8C=E6=A0=A1=E9=AA=8C=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=B1=A0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../performance/engine/docker/DockerTestEngine.java            | 3 +++
 backend/src/main/java/io/metersphere/xpack                     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

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