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:
Captain.B 2021-05-13 19:31:07 +08:00 committed by 刘瑞斌
parent 284f673ac8
commit 103b2946fa
6 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/java/io/metersphere/performance/controller/JmeterFileController.java
View File

@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.Arrays;
@RestController
@RequestMapping("jmeter")
@ -25,10 +26,11 @@ public class JmeterFileController {
@GetMapping("download")
public ResponseEntity<byte[]> downloadJmeterFiles(@RequestParam("testId") String testId, @RequestParam("resourceId") String resourceId,
@RequestParam("ratio") double ratio,
@RequestParam("ratio") String ratio,
@RequestParam("reportId") String reportId, @RequestParam("resourceIndex") int resourceIndex) {
long startTime = System.currentTimeMillis();
byte[] bytes = jmeterFileService.downloadZip(testId, resourceId, ratio, startTime, reportId, resourceIndex);
double[] ratios = Arrays.stream(ratio.split(",")).mapToDouble(Double::parseDouble).toArray();
byte[] bytes = jmeterFileService.downloadZip(testId, ratios, startTime, reportId, resourceIndex);
return ResponseEntity.ok()
.contentType(MediaType.parseMediaType("application/octet-stream"))
.header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + testId + ".zip\"")

13
backend/src/main/java/io/metersphere/performance/engine/EngineFactory.java
View File

@ -88,7 +88,7 @@ public class EngineFactory {
return null;
}
public static EngineContext createContext(LoadTestWithBLOBs loadTest, String resourceId, double ratio, long startTime, String reportId, int resourceIndex) {
public static EngineContext createContext(LoadTestWithBLOBs loadTest, double[] ratios, long startTime, String reportId, int resourceIndex) {
final List<FileMetadata> fileMetadataList = performanceTestService.getFileMetadataByTestId(loadTest.getId());
if (org.springframework.util.CollectionUtils.isEmpty(fileMetadataList)) {
MSException.throwException(Translator.get("run_load_test_file_not_found") + loadTest.getId());
@ -124,7 +124,16 @@ public class EngineFactory {
if (values instanceof List) {
Object value = b.get("value");
if ("TargetLevel".equals(key)) {
value = Math.round(((Integer) b.get("value")) * ratio);
Integer targetLevel = ((Integer) b.get("value"));
if (resourceIndex + 1 == ratios.length) {
double beforeLast = 0; // 前几个线程数
for (int k = 0; k < ratios.length - 1; k++) {
beforeLast += Math.round(targetLevel * ratios[k]);
}
value = Math.round(targetLevel - beforeLast);
} else {
value = Math.round(targetLevel * ratios[resourceIndex]);
}
}
((List<Object>) values).add(value);
engineContext.addProperty(key, values);

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

@ -19,9 +19,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.web.client.RestTemplate;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
public class DockerTestEngine extends AbstractEngine {
private static final String BASE_URL = "http://%s:%d";
@ -50,20 +48,20 @@ public class DockerTestEngine extends AbstractEngine {
if (threadNum > totalThreadNum - runningSumThreadNum) {
MSException.throwException(Translator.get("max_thread_insufficient"));
}
List<Integer> resourceRatio = resourceList.stream()
Object[] resourceRatios = resourceList.stream()
.filter(r -> ResourceStatusEnum.VALID.name().equals(r.getStatus()))
.map(r -> JSON.parseObject(r.getConfiguration(), NodeDTO.class).getMaxConcurrency())
.collect(Collectors.toList());
.map(r -> r * 1.0 / totalThreadNum)
.map(r -> String.format("%.2f", r))
.toArray();
for (int i = 0, size = resourceList.size(); i < size; i++) {
int ratio = resourceRatio.get(i);
// double realThreadNum = ((double) ratio / totalThreadNum) * threadNum;
runTest(resourceList.get(i), ((double) ratio / totalThreadNum), i);
runTest(resourceList.get(i), resourceRatios, i);
}
}
private void runTest(TestResource resource, double ratio, int resourceIndex) {
private void runTest(TestResource resource, Object[] ratios, int resourceIndex) {
String configuration = resource.getConfiguration();
NodeDTO node = JSON.parseObject(configuration, NodeDTO.class);
@ -84,7 +82,7 @@ public class DockerTestEngine extends AbstractEngine {
}
Map<String, String> env = new HashMap<>();
env.put("RATIO", "" + ratio);
env.put("RATIO", StringUtils.join(ratios, ","));
env.put("RESOURCE_INDEX", "" + resourceIndex);
env.put("METERSPHERE_URL", metersphereUrl);
env.put("START_TIME", "" + this.getStartTime());

4
backend/src/main/java/io/metersphere/performance/service/JmeterFileService.java
View File

@ -29,10 +29,10 @@ public class JmeterFileService {
@Resource
private ExtLoadTestReportMapper extLoadTestReportMapper;
public byte[] downloadZip(String testId, String resourceId, double ratio, long startTime, String reportId, int resourceIndex) {
public byte[] downloadZip(String testId, double[] ratios, long startTime, String reportId, int resourceIndex) {
try {
LoadTestWithBLOBs loadTest = loadTestMapper.selectByPrimaryKey(testId);
EngineContext context = EngineFactory.createContext(loadTest, resourceId, ratio, startTime, reportId, resourceIndex);
EngineContext context = EngineFactory.createContext(loadTest, ratios, startTime, reportId, resourceIndex);
return zipFilesToByteArray(context);
} catch (MSException e) {
LogUtil.error(e.getMessage(), e);

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

@ -1 +1 @@
Subproject commit e435fe1d01a2495481efa58daf3875be07b2ac9b
Subproject commit 9a95a444a4f0a477427f94bd107571430d85e766

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit 931fd2c6ee8af72a43629f6424fc77e95e17ce1a
Subproject commit 097d3a5a00beaa660d34525765d93b35e63f52c0