test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: 选择资源池时不指定node

This commit is contained in:
CaptainB 2021-10-27 16:32:00 +08:00 committed by 刘瑞斌
parent 9242700b93
commit 30acffedc1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/metersphere/api/jmeter/ResourcePoolCalculation.java
View File

@ -43,7 +43,7 @@ public class ResourcePoolCalculation {
public TestResource getPool(String resourcePoolId) { public TestResource getPool(String resourcePoolId) {
// 获取可以执行的资源池 // 获取可以执行的资源池
TestResourcePoolExample example = new TestResourcePoolExample(); TestResourcePoolExample example = new TestResourcePoolExample();
example.createCriteria().andStatusEqualTo("VALID").andTypeEqualTo("NODE").andIdEqualTo(resourcePoolId); example.createCriteria().andStatusEqualTo("VALID").andIdEqualTo(resourcePoolId);
List<TestResourcePool> pools = testResourcePoolMapper.selectByExample(example); List<TestResourcePool> pools = testResourcePoolMapper.selectByExample(example);
// 按照NODE节点的可用内存空间大小排序 // 按照NODE节点的可用内存空间大小排序
List<JvmInfoDTO> availableNodes = new ArrayList<>(); List<JvmInfoDTO> availableNodes = new ArrayList<>();
@ -78,7 +78,7 @@ public class ResourcePoolCalculation {
public List<JvmInfoDTO> getPools(String resourcePoolId) { public List<JvmInfoDTO> getPools(String resourcePoolId) {
// 获取可以执行的资源池 // 获取可以执行的资源池
TestResourcePoolExample example = new TestResourcePoolExample(); TestResourcePoolExample example = new TestResourcePoolExample();
example.createCriteria().andStatusEqualTo("VALID").andTypeEqualTo("NODE").andIdEqualTo(resourcePoolId); example.createCriteria().andStatusEqualTo("VALID").andIdEqualTo(resourcePoolId);
List<TestResourcePool> pools = testResourcePoolMapper.selectByExample(example); List<TestResourcePool> pools = testResourcePoolMapper.selectByExample(example);
// 按照NODE节点的可用内存空间大小排序 // 按照NODE节点的可用内存空间大小排序