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

refactor(性能测试): 校验资源池的时候超时时间缩短

This commit is contained in:
CaptainB 2022-01-22 09:36:01 +08:00 committed by 刘瑞斌
parent 9813af4cc0
commit ece7785fc0
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
backend/src/main/java/io/metersphere/service/NodeResourcePoolService.java
View File

@ -15,6 +15,7 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.ImmutablePair;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
@ -33,11 +34,19 @@ import static io.metersphere.commons.constants.ResourceStatusEnum.VALID;
public class NodeResourcePoolService { public class NodeResourcePoolService {
private final static String nodeControllerUrl = "http://%s:%s/status"; private final static String nodeControllerUrl = "http://%s:%s/status";
@Resource(name = "restTemplateWithTimeOut") private static final RestTemplate restTemplateWithTimeOut = new RestTemplate();
private RestTemplate restTemplateWithTimeOut;
@Resource @Resource
private TestResourceMapper testResourceMapper; private TestResourceMapper testResourceMapper;
static {
HttpComponentsClientHttpRequestFactory httpRequestFactory = new HttpComponentsClientHttpRequestFactory();
httpRequestFactory.setConnectionRequestTimeout(2000);
httpRequestFactory.setConnectTimeout(2000);
httpRequestFactory.setReadTimeout(1000);
restTemplateWithTimeOut.setRequestFactory(httpRequestFactory);
}
public boolean validate(TestResourcePoolDTO testResourcePool) { public boolean validate(TestResourcePoolDTO testResourcePool) {
if (CollectionUtils.isEmpty(testResourcePool.getResources())) { if (CollectionUtils.isEmpty(testResourcePool.getResources())) {
MSException.throwException(Translator.get("no_nodes_message")); MSException.throwException(Translator.get("no_nodes_message"));