From c03a7f181b7efcc4f2f1ebbe3bc8da4b2898b66f Mon Sep 17 00:00:00 2001 From: guoyuqi Date: Thu, 17 Oct 2024 12:56:03 +0800 Subject: [PATCH] =?UTF-8?q?perf(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86):=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=BA=90=E6=B1=A0=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=89=A9=E4=BD=99=E5=B9=B6=E5=8F=91=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/TestResourcePoolService.java | 78 +++++++++++++++---- 1 file changed, 62 insertions(+), 16 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 54c13ee9b1..b705a7263b 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 @@ -17,6 +17,7 @@ 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; @@ -28,8 +29,12 @@ import org.mybatis.spring.SqlSessionUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.List; +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; @Service @Transactional @@ -48,6 +53,8 @@ public class TestResourcePoolService { @Resource private ExtResourcePoolMapper extResourcePoolMapper; + private final ExecutorService executor = Executors.newFixedThreadPool(5); + private final static String poolControllerUrl = "http://%s:%s/metric"; @@ -131,6 +138,9 @@ 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(); @@ -158,26 +168,57 @@ public class TestResourcePoolService { } //获取最大并发 if (StringUtils.equalsIgnoreCase(pool.getType(), ResourcePoolTypeEnum.NODE.getName())) { - int maxConcurrentNumber = 0; - int concurrentNumber = 0; - int occupiedConcurrentNumber = 0; - for (TestResourceNodeDTO testResourceNodeDTO : testResourceDTO.getNodesList()) { - maxConcurrentNumber = maxConcurrentNumber + testResourceNodeDTO.getConcurrentNumber(); - //TODO： 调接口获取剩余并发 - ResourcePoolNodeMetric nodeMetric = getNodeMetric(testResourceNodeDTO.getIp(), testResourceNodeDTO.getPort()); - if (nodeMetric != null) { - concurrentNumber = concurrentNumber + (nodeMetric.getConcurrentNumber() == null ? 0 :nodeMetric.getConcurrentNumber()); - occupiedConcurrentNumber = occupiedConcurrentNumber +(nodeMetric.getOccupiedConcurrentNumber() == null ? 0 :nodeMetric.getOccupiedConcurrentNumber()); - } - } - testResourcePoolDTO.setLastConcurrentNumber(concurrentNumber-occupiedConcurrentNumber); - testResourcePoolDTO.setMaxConcurrentNumber(maxConcurrentNumber); + nodeMap.put(pool.getId(), testResourceDTO.getNodesList()); + poolDTOMap.put(pool.getId(), testResourcePoolDTO); + Set nodeSet = testResourceDTO.getNodesList().stream() + .map(node -> node.getIp() + ":" + node.getPort()) + .collect(Collectors.toSet()); + nodeSets.addAll(nodeSet); } else { + //处理k8s资源池 testResourcePoolDTO.setMaxConcurrentNumber(testResourceDTO.getConcurrentNumber()); + testResourcePoolDTOS.add(testResourcePoolDTO); } + }); + //处理node资源池 + MaplastConcurrentNumberMap = 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); + testResourcePoolDTO.setLastConcurrentNumber(lastConcurrentNumber); + testResourcePoolDTO.setMaxConcurrentNumber(maxConcurrentNumber); testResourcePoolDTOS.add(testResourcePoolDTO); }); + return testResourcePoolDTOS; } @@ -310,4 +351,9 @@ public class TestResourcePoolService { public ResourcePoolNodeMetric getTestResourcePoolCapacityDetail(TestResourcePoolCapacityRequest request) { return getNodeMetric(request.getIp(), request.getPort()); } + + @PreDestroy + private void shutdownExecutor() { + executor.shutdown(); + } }