From a6ba89f077a1983336cf961e5ecbaa0d943d1aca Mon Sep 17 00:00:00 2001 From: guoyuqi Date: Thu, 17 Oct 2024 17:51:04 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86):?= =?UTF-8?q?=20=E8=B5=84=E6=BA=90=E6=B1=A0=E5=88=97=E8=A1=A8=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=89=A9=E4=BD=99=E5=B9=B6=E5=8F=91=E6=95=B0?= =?UTF-8?q?=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/TestResourcePoolService.java | 70 ++----------------- 1 file changed, 6 insertions(+), 64 deletions(-) diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/TestResourcePoolService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/TestResourcePoolService.java index 14312f7572..72e7cf97c3 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/TestResourcePoolService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/TestResourcePoolService.java @@ -18,7 +18,6 @@ import io.metersphere.system.log.dto.LogDTO; import io.metersphere.system.mapper.*; import io.metersphere.system.uid.IDGenerator; import io.metersphere.system.utils.TaskRunnerClient; -import jakarta.annotation.PreDestroy; import jakarta.annotation.Resource; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.BooleanUtils; @@ -30,12 +29,8 @@ import org.mybatis.spring.SqlSessionUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.*; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.stream.Collectors; +import java.util.ArrayList; +import java.util.List; @Service @Transactional @@ -54,8 +49,6 @@ public class TestResourcePoolService { @Resource private ExtResourcePoolMapper extResourcePoolMapper; - private final ExecutorService executor = Executors.newFixedThreadPool(5); - private final static String poolControllerUrl = "http://%s:%s/metric"; @@ -135,9 +128,6 @@ public class TestResourcePoolService { public List listResourcePools(QueryResourcePoolRequest request) { List testResourcePools = extResourcePoolMapper.getResourcePoolList(request); List testResourcePoolDTOS = new ArrayList<>(); - Map> nodeMap = new HashMap<>(); - Map poolDTOMap = new HashMap<>(); - Set nodeSets = new HashSet<>(); testResourcePools.forEach(pool -> { TestResourcePoolBlob testResourcePoolBlob = testResourcePoolBlobMapper.selectByPrimaryKey(pool.getId()); byte[] configuration = testResourcePoolBlob.getConfiguration(); @@ -165,58 +155,15 @@ public class TestResourcePoolService { } //获取最大并发 if (StringUtils.equalsIgnoreCase(pool.getType(), ResourcePoolTypeEnum.NODE.getName())) { - nodeMap.put(pool.getId(), testResourceDTO.getNodesList()); - poolDTOMap.put(pool.getId(), testResourcePoolDTO); - if (pool.getEnable()) { - Set nodeSet = testResourceDTO.getNodesList().stream() - .map(node -> node.getIp() + ":" + node.getPort()) - .collect(Collectors.toSet()); - nodeSets.addAll(nodeSet); + int maxConcurrentNumber = 0; + for (TestResourceNodeDTO testResourceNodeDTO : testResourceDTO.getNodesList()) { + maxConcurrentNumber = maxConcurrentNumber + testResourceNodeDTO.getConcurrentNumber(); } + testResourcePoolDTO.setMaxConcurrentNumber(maxConcurrentNumber); } else { //处理k8s资源池 testResourcePoolDTO.setMaxConcurrentNumber(testResourceDTO.getConcurrentNumber()); - testResourcePoolDTOS.add(testResourcePoolDTO); } - }); - //处理node资源池 - Map lastConcurrentNumberMap = new HashMap<>(); - - List>> futures = new ArrayList<>(); - for (String nodeSet : nodeSets) { - futures.add(executor.submit(() -> { - String[] split = nodeSet.split(":"); - ResourcePoolNodeMetric nodeMetric = getNodeMetric(split[0], split[1]); - Map resultMap = new HashMap<>(); - if (nodeMetric != null) { - resultMap.put(nodeSet, nodeMetric.getConcurrentNumber() - nodeMetric.getOccupiedConcurrentNumber()); - } - return resultMap; - })); - } - - for (Future> future : futures) { - try { - lastConcurrentNumberMap.putAll(future.get()); - } catch (InterruptedException | ExecutionException e) { - // 处理异常 - LogUtils.error("获取剩余并发数失败：" + e); - } - } - nodeMap.forEach((poolId, nodeList) -> { - int lastConcurrentNumber = 0; - int maxConcurrentNumber = 0; - for (TestResourceNodeDTO testResourceNodeDTO : nodeList) { - if (lastConcurrentNumberMap.get(testResourceNodeDTO.getIp() + ":" + testResourceNodeDTO.getPort()) != null) { - lastConcurrentNumber = lastConcurrentNumber + lastConcurrentNumberMap.get(testResourceNodeDTO.getIp() + ":" + testResourceNodeDTO.getPort()); - } - maxConcurrentNumber = maxConcurrentNumber + testResourceNodeDTO.getConcurrentNumber(); - } - TestResourcePoolDTO testResourcePoolDTO = poolDTOMap.get(poolId); - if (testResourcePoolDTO.getEnable()) { - testResourcePoolDTO.setLastConcurrentNumber(lastConcurrentNumber); - } - testResourcePoolDTO.setMaxConcurrentNumber(maxConcurrentNumber); testResourcePoolDTOS.add(testResourcePoolDTO); }); @@ -356,9 +303,4 @@ public class TestResourcePoolService { } return getNodeMetric(request.getIp(), request.getPort()); } - - @PreDestroy - public void shutdownExecutor() { - executor.shutdown(); - } }