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

restTemplate 超时限制

This commit is contained in:
shiziyuan9527 2020-06-12 20:32:17 +08:00
parent 3e31004632
commit 3738f77950
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/src/main/java/io/metersphere/config/WebConfig.java
View File

@ -18,6 +18,11 @@ public class WebConfig implements WebMvcConfigurer {
@Bean
public RestTemplate restTemplate() {
return new RestTemplate();
}
@Bean
public RestTemplate restTemplateWithTimeOut() {
RestTemplate restTemplate = new RestTemplate();
HttpComponentsClientHttpRequestFactory httpRequestFactory = new HttpComponentsClientHttpRequestFactory();
httpRequestFactory.setConnectionRequestTimeout(4000);

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

@ -14,7 +14,6 @@ import io.metersphere.performance.engine.EngineContext;
import io.metersphere.performance.engine.EngineFactory;
import io.metersphere.performance.engine.docker.request.TestRequest;
import org.springframework.web.client.RestTemplate;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -23,6 +22,7 @@ import java.util.stream.Collectors;
public class DockerTestEngine extends AbstractEngine {
private static final String BASE_URL = "http://%s:%d";
private RestTemplate restTemplate;
private RestTemplate restTemplateWithTimeOut;
public DockerTestEngine(LoadTestWithBLOBs loadTest) {
this.init(loadTest);
@ -31,7 +31,8 @@ public class DockerTestEngine extends AbstractEngine {
@Override
protected void init(LoadTestWithBLOBs loadTest) {
super.init(loadTest);
this.restTemplate = CommonBeanFactory.getBean(RestTemplate.class);
this.restTemplate = (RestTemplate) CommonBeanFactory.getBean("restTemplate");
this.restTemplateWithTimeOut = (RestTemplate) CommonBeanFactory.getBean("restTemplateWithTimeOut");
// todo 初始化操作
}
@ -85,12 +86,7 @@ public class DockerTestEngine extends AbstractEngine {
testRequest.setTestData(context.getTestData());
testRequest.setEnv(context.getEnv());
try {
restTemplate.postForObject(uri, testRequest, String.class);
} catch (Exception e) {
LogUtil.error("run test fail..." + testId);
MSException.throwException(Translator.get("start_engine_fail"));
}
restTemplate.postForObject(uri, testRequest, String.class);
}
@Override
@ -104,7 +100,7 @@ public class DockerTestEngine extends AbstractEngine {
String uri = String.format(BASE_URL + "/jmeter/container/stop/" + testId, ip, port);
try {
restTemplate.getForObject(uri, String.class);
restTemplateWithTimeOut.getForObject(uri, String.class);
} catch (Exception e) {
LogUtil.error("stop load test fail... " + testId);
MSException.throwException(Translator.get("delete_fail"));

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

@ -48,7 +48,7 @@ public class TestResourcePoolService {
@Resource
private TestResourceMapper testResourceMapper;
@Resource
private RestTemplate restTemplate;
private RestTemplate restTemplateWithTimeOut;
@Resource
private LoadTestMapper loadTestMapper;
@ -201,7 +201,7 @@ public class TestResourcePoolService {
private boolean validateNode(NodeDTO node) {
try {
ResponseEntity<String> entity = restTemplate.getForEntity(String.format(nodeControllerUrl, node.getIp(), node.getPort()), String.class);
ResponseEntity<String> entity = restTemplateWithTimeOut.getForEntity(String.format(nodeControllerUrl, node.getIp(), node.getPort()), String.class);
return HttpStatus.OK.equals(entity.getStatusCode());
} catch (Exception e) {
LogUtil.error(e);