From 9b1ab5c1fdeee81bec642621a3e62cc0741841b2 Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Wed, 12 Oct 2022 11:41:42 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8Dnode=E6=89=A7=E8=A1=8C=E4=B8=AD=E5=BA=8F?= =?UTF-8?q?=E5=88=97=E5=8C=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1017866 --user=赵勇 【接口测试】接口case列表中批量执行10个case-串行-node资源池-失败停止，结果执行失败 https://www.tapd.cn/55049933/s/1259265 --- .../api/exec/api/ApiCaseParallelExecuteService.java | 2 +- .../io/metersphere/api/exec/api/ApiCaseSerialService.java | 2 +- .../api/exec/scenario/ApiScenarioParallelService.java | 2 +- .../api/exec/scenario/ApiScenarioSerialService.java | 2 +- .../main/java/io/metersphere/api/jmeter/JMeterService.java | 4 ++-- .../api/jmeter/{algorithm => utils}/ServerConfig.java | 2 +- .../api/jmeter/{algorithm => utils}/SmoothWeighted.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) rename api-test/backend/src/main/java/io/metersphere/api/jmeter/{algorithm => utils}/ServerConfig.java (97%) rename api-test/backend/src/main/java/io/metersphere/api/jmeter/{algorithm => utils}/SmoothWeighted.java (99%) diff --git a/api-test/backend/src/main/java/io/metersphere/api/exec/api/ApiCaseParallelExecuteService.java b/api-test/backend/src/main/java/io/metersphere/api/exec/api/ApiCaseParallelExecuteService.java index c5df666327..dc06c62df8 100644 --- a/api-test/backend/src/main/java/io/metersphere/api/exec/api/ApiCaseParallelExecuteService.java +++ b/api-test/backend/src/main/java/io/metersphere/api/exec/api/ApiCaseParallelExecuteService.java @@ -3,7 +3,7 @@ package io.metersphere.api.exec.api; import io.metersphere.api.exec.queue.DBTestQueue; import io.metersphere.commons.utils.GenerateHashTreeUtil; import io.metersphere.api.jmeter.JMeterService; -import io.metersphere.api.jmeter.algorithm.SmoothWeighted; +import io.metersphere.api.jmeter.utils.SmoothWeighted; import io.metersphere.base.domain.ApiDefinitionExecResultWithBLOBs; import io.metersphere.commons.utils.CommonBeanFactory; import io.metersphere.constants.RunModeConstants; diff --git a/api-test/backend/src/main/java/io/metersphere/api/exec/api/ApiCaseSerialService.java b/api-test/backend/src/main/java/io/metersphere/api/exec/api/ApiCaseSerialService.java index 2df2b34b21..8b7a8ac1dd 100644 --- a/api-test/backend/src/main/java/io/metersphere/api/exec/api/ApiCaseSerialService.java +++ b/api-test/backend/src/main/java/io/metersphere/api/exec/api/ApiCaseSerialService.java @@ -14,7 +14,7 @@ import io.metersphere.api.dto.definition.request.sampler.MsTCPSampler; import io.metersphere.api.exec.queue.DBTestQueue; import io.metersphere.api.jmeter.JMeterService; import io.metersphere.api.jmeter.NewDriverManager; -import io.metersphere.api.jmeter.algorithm.SmoothWeighted; +import io.metersphere.api.jmeter.utils.SmoothWeighted; import io.metersphere.service.ApiExecutionQueueService; import io.metersphere.service.RemakeReportService; import io.metersphere.base.domain.ApiDefinitionExecResultWithBLOBs; diff --git a/api-test/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioParallelService.java b/api-test/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioParallelService.java index 52c450d127..9895492153 100644 --- a/api-test/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioParallelService.java +++ b/api-test/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioParallelService.java @@ -5,7 +5,7 @@ import io.metersphere.api.dto.automation.RunScenarioRequest; import io.metersphere.api.exec.queue.DBTestQueue; import io.metersphere.commons.utils.GenerateHashTreeUtil; import io.metersphere.api.jmeter.JMeterService; -import io.metersphere.api.jmeter.algorithm.SmoothWeighted; +import io.metersphere.api.jmeter.utils.SmoothWeighted; import io.metersphere.constants.RunModeConstants; import io.metersphere.dto.BaseSystemConfigDTO; import io.metersphere.dto.JmeterRunRequestDTO; diff --git a/api-test/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioSerialService.java b/api-test/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioSerialService.java index 63f6115781..a214e6094f 100644 --- a/api-test/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioSerialService.java +++ b/api-test/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioSerialService.java @@ -3,7 +3,7 @@ package io.metersphere.api.exec.scenario; import io.metersphere.api.exec.queue.DBTestQueue; import io.metersphere.api.jmeter.JMeterService; -import io.metersphere.api.jmeter.algorithm.SmoothWeighted; +import io.metersphere.api.jmeter.utils.SmoothWeighted; import io.metersphere.base.domain.ApiExecutionQueueDetail; import io.metersphere.base.domain.ApiScenarioReport; import io.metersphere.base.domain.ApiScenarioWithBLOBs; diff --git a/api-test/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java b/api-test/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java index 02accb5462..00faba5752 100644 --- a/api-test/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java +++ b/api-test/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java @@ -3,8 +3,8 @@ package io.metersphere.api.jmeter; import io.metersphere.api.exec.engine.EngineFactory; import io.metersphere.api.exec.queue.ExecThreadPoolExecutor; -import io.metersphere.api.jmeter.algorithm.ServerConfig; -import io.metersphere.api.jmeter.algorithm.SmoothWeighted; +import io.metersphere.api.jmeter.utils.ServerConfig; +import io.metersphere.api.jmeter.utils.SmoothWeighted; import io.metersphere.commons.config.KafkaConfig; import io.metersphere.service.RemakeReportService; import io.metersphere.commons.constants.ApiRunMode; diff --git a/api-test/backend/src/main/java/io/metersphere/api/jmeter/algorithm/ServerConfig.java b/api-test/backend/src/main/java/io/metersphere/api/jmeter/utils/ServerConfig.java similarity index 97% rename from api-test/backend/src/main/java/io/metersphere/api/jmeter/algorithm/ServerConfig.java rename to api-test/backend/src/main/java/io/metersphere/api/jmeter/utils/ServerConfig.java index 3d75e9b71f..534bdecc5d 100644 --- a/api-test/backend/src/main/java/io/metersphere/api/jmeter/algorithm/ServerConfig.java +++ b/api-test/backend/src/main/java/io/metersphere/api/jmeter/utils/ServerConfig.java @@ -1,4 +1,4 @@ -package io.metersphere.api.jmeter.algorithm; +package io.metersphere.api.jmeter.utils; import lombok.Data; import org.apache.commons.lang3.StringUtils; diff --git a/api-test/backend/src/main/java/io/metersphere/api/jmeter/algorithm/SmoothWeighted.java b/api-test/backend/src/main/java/io/metersphere/api/jmeter/utils/SmoothWeighted.java similarity index 99% rename from api-test/backend/src/main/java/io/metersphere/api/jmeter/algorithm/SmoothWeighted.java rename to api-test/backend/src/main/java/io/metersphere/api/jmeter/utils/SmoothWeighted.java index c8c2fc8801..d5e2b58496 100644 --- a/api-test/backend/src/main/java/io/metersphere/api/jmeter/algorithm/SmoothWeighted.java +++ b/api-test/backend/src/main/java/io/metersphere/api/jmeter/utils/SmoothWeighted.java @@ -1,4 +1,4 @@ -package io.metersphere.api.jmeter.algorithm; +package io.metersphere.api.jmeter.utils; import io.metersphere.commons.utils.GenerateHashTreeUtil;