zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ISSUE#3192] naming module replace http client (#3763)

Browse Source 
* naming module replace http client

* refactor: naming module replace http client.

* refactor: naming module replace http client.

* refactor: Add apache http client Factory.

* refactor: naming module replace http client.

* fix code style

* refactor: Add http client config

* refactor: naming module HttpClientManager change

* refactor: naming module HttpClientManager change

* refactor: naming module replace http client.

* fix code style

* refactor: fix JDK http client Use error problem.

* refactor: Query And Header entity init Add non-empty judgment

* Enhance the asynchronous http delete request method to support body passing parameters.

* refactor: apache http client set MaxConnTotal and maxConnPerRoute.
This commit is contained in:
mai.jh 2020-09-15 09:18:20 +08:00 committed by GitHub
parent dc5cba2e69
commit 5e4429f0e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 764 additions and 648 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/src/main/java/com/alibaba/nacos/common/http/AbstractApacheHttpClientFactory.java
View File

@ -30,9 +30,15 @@ public abstract class AbstractApacheHttpClientFactory extends AbstractHttpClient
@Override @Override
public final NacosRestTemplate createNacosRestTemplate() { public final NacosRestTemplate createNacosRestTemplate() {
final HttpClientConfig originalRequestConfig = buildHttpClientConfig();
final RequestConfig requestConfig = getRequestConfig(); final RequestConfig requestConfig = getRequestConfig();
return new NacosRestTemplate(assignLogger(), return new NacosRestTemplate(assignLogger(), new DefaultHttpClientRequest(
new DefaultHttpClientRequest(HttpClients.custom().setDefaultRequestConfig(requestConfig).build())); HttpClients.custom().setDefaultRequestConfig(requestConfig)
.setUserAgent(originalRequestConfig.getUserAgent())
.setMaxConnTotal(originalRequestConfig.getMaxConnTotal())
.setMaxConnPerRoute(originalRequestConfig.getMaxConnPerRoute())
.setConnectionTimeToLive(originalRequestConfig.getConnTimeToLive(),
originalRequestConfig.getConnTimeToLiveTimeUnit()).build()));
} }
} }

9
common/src/main/java/com/alibaba/nacos/common/http/AbstractHttpClientFactory.java
View File

@ -67,15 +67,20 @@ public abstract class AbstractHttpClientFactory implements HttpClientFactory {
@Override @Override
public NacosAsyncRestTemplate createNacosAsyncRestTemplate() { public NacosAsyncRestTemplate createNacosAsyncRestTemplate() {
RequestConfig requestConfig = getRequestConfig(); final HttpClientConfig originalRequestConfig = buildHttpClientConfig();
final RequestConfig requestConfig = getRequestConfig();
return new NacosAsyncRestTemplate(assignLogger(), new DefaultAsyncHttpClientRequest( return new NacosAsyncRestTemplate(assignLogger(), new DefaultAsyncHttpClientRequest(
HttpAsyncClients.custom().setDefaultRequestConfig(requestConfig).build())); HttpAsyncClients.custom().setDefaultRequestConfig(requestConfig)
.setMaxConnTotal(originalRequestConfig.getMaxConnTotal())
.setMaxConnPerRoute(originalRequestConfig.getMaxConnPerRoute())
.setUserAgent(originalRequestConfig.getUserAgent()).build()));
} }
protected RequestConfig getRequestConfig() { protected RequestConfig getRequestConfig() {
HttpClientConfig httpClientConfig = buildHttpClientConfig(); HttpClientConfig httpClientConfig = buildHttpClientConfig();
return RequestConfig.custom().setConnectTimeout(httpClientConfig.getConTimeOutMillis()) return RequestConfig.custom().setConnectTimeout(httpClientConfig.getConTimeOutMillis())
.setSocketTimeout(httpClientConfig.getReadTimeOutMillis()) .setSocketTimeout(httpClientConfig.getReadTimeOutMillis())
.setConnectionRequestTimeout(httpClientConfig.getConnectionRequestTimeout())
.setMaxRedirects(httpClientConfig.getMaxRedirects()).build(); .setMaxRedirects(httpClientConfig.getMaxRedirects()).build();
} }

3
common/src/main/java/com/alibaba/nacos/common/http/BaseHttpClient.java
View File

@ -16,7 +16,6 @@
package com.alibaba.nacos.common.http; package com.alibaba.nacos.common.http;
import com.alibaba.nacos.common.constant.HttpHeaderConsts;
import com.alibaba.nacos.common.http.handler.ResponseHandler; import com.alibaba.nacos.common.http.handler.ResponseHandler;
import com.alibaba.nacos.common.http.param.Header; import com.alibaba.nacos.common.http.param.Header;
import com.alibaba.nacos.common.http.param.Query; import com.alibaba.nacos.common.http.param.Query;
@ -103,7 +102,7 @@ public abstract class BaseHttpClient {
final BaseHttpMethod httpMethod = BaseHttpMethod.sourceOf(method); final BaseHttpMethod httpMethod = BaseHttpMethod.sourceOf(method);
final HttpRequestBase httpRequestBase = httpMethod.init(url); final HttpRequestBase httpRequestBase = httpMethod.init(url);
HttpUtils.initRequestHeader(httpRequestBase, header); HttpUtils.initRequestHeader(httpRequestBase, header);
HttpUtils.initRequestEntity(httpRequestBase, body, header.getValue(HttpHeaderConsts.CONTENT_TYPE)); HttpUtils.initRequestEntity(httpRequestBase, body, header);
return httpRequestBase; return httpRequestBase;
} }

36
common/src/main/java/com/alibaba/nacos/common/http/BaseHttpMethod.java
View File

@ -84,6 +84,16 @@ public enum BaseHttpMethod {
} }
}, },
/**
* delete Large request.
*/
DELETE_LARGE(HttpMethod.DELETE_LARGE) {
@Override
protected HttpRequestBase createRequest(String url) {
return new HttpDeleteWithEntity(url);
}
},
/** /**
* head request. * head request.
*/ */
@ -155,6 +165,10 @@ public enum BaseHttpMethod {
/** /**
* get Large implemented. * get Large implemented.
* <p>
* Mainly used for GET request parameters are relatively large, can not be placed on the URL, so it needs to be
* placed in the body.
* </p>
*/ */
public static class HttpGetWithEntity extends HttpEntityEnclosingRequestBase { public static class HttpGetWithEntity extends HttpEntityEnclosingRequestBase {
@ -171,4 +185,26 @@ public enum BaseHttpMethod {
} }
} }
/**
* delete Large implemented.
* <p>
* Mainly used for DELETE request parameters are relatively large, can not be placed on the URL, so it needs to be
* placed in the body.
* </p>
*/
public static class HttpDeleteWithEntity extends HttpEntityEnclosingRequestBase {
public static final String METHOD_NAME = "DELETE";
public HttpDeleteWithEntity(String url) {
super();
setURI(URI.create(url));
}
@Override
public String getMethod() {
return METHOD_NAME;
}
}
} }

115
common/src/main/java/com/alibaba/nacos/common/http/HttpClientConfig.java
View File

@ -16,6 +16,8 @@
package com.alibaba.nacos.common.http; package com.alibaba.nacos.common.http;
import java.util.concurrent.TimeUnit;
/** /**
* http client config build. * http client config build.
* *
@ -23,16 +25,62 @@ package com.alibaba.nacos.common.http;
*/ */
public class HttpClientConfig { public class HttpClientConfig {
/**
* connect time out.
*/
private final int conTimeOutMillis; private final int conTimeOutMillis;
/**
* read time out.
*/
private final int readTimeOutMillis; private final int readTimeOutMillis;
/**
* connTimeToLive.
*/
private final long connTimeToLive;
/**
* connTimeToLiveTimeUnit.
*/
private final TimeUnit connTimeToLiveTimeUnit;
/**
* connectionRequestTimeout.
*/
private final int connectionRequestTimeout;
/**
* max redirect.
*/
private final int maxRedirects; private final int maxRedirects;
public HttpClientConfig(int conTimeOutMillis, int readTimeOutMillis, int maxRedirects) { /**
* max connect total.
*/
private final int maxConnTotal;
/**
* Assigns maximum connection per route value.
*/
private final int maxConnPerRoute;
/**
* user agent.
*/
private final String userAgent;
public HttpClientConfig(int conTimeOutMillis, int readTimeOutMillis, long connTimeToLive, TimeUnit timeUnit,
int connectionRequestTimeout, int maxRedirects, int maxConnTotal, int maxConnPerRoute, String userAgent) {
this.conTimeOutMillis = conTimeOutMillis; this.conTimeOutMillis = conTimeOutMillis;
this.readTimeOutMillis = readTimeOutMillis; this.readTimeOutMillis = readTimeOutMillis;
this.connTimeToLive = connTimeToLive;
this.connTimeToLiveTimeUnit = timeUnit;
this.connectionRequestTimeout = connectionRequestTimeout;
this.maxRedirects = maxRedirects; this.maxRedirects = maxRedirects;
this.maxConnTotal = maxConnTotal;
this.maxConnPerRoute = maxConnPerRoute;
this.userAgent = userAgent;
} }
public int getConTimeOutMillis() { public int getConTimeOutMillis() {
@ -43,10 +91,34 @@ public class HttpClientConfig {
return readTimeOutMillis; return readTimeOutMillis;
} }
public long getConnTimeToLive() {
return connTimeToLive;
}
public TimeUnit getConnTimeToLiveTimeUnit() {
return connTimeToLiveTimeUnit;
}
public int getConnectionRequestTimeout() {
return connectionRequestTimeout;
}
public int getMaxRedirects() { public int getMaxRedirects() {
return maxRedirects; return maxRedirects;
} }
public int getMaxConnTotal() {
return maxConnTotal;
}
public int getMaxConnPerRoute() {
return maxConnPerRoute;
}
public String getUserAgent() {
return userAgent;
}
public static HttpClientConfigBuilder builder() { public static HttpClientConfigBuilder builder() {
return new HttpClientConfigBuilder(); return new HttpClientConfigBuilder();
} }
@ -57,8 +129,20 @@ public class HttpClientConfig {
private int readTimeOutMillis = -1; private int readTimeOutMillis = -1;
private long connTimeToLive = -1;
private TimeUnit connTimeToLiveTimeUnit = TimeUnit.MILLISECONDS;
private int connectionRequestTimeout = -1;
private int maxRedirects = 50; private int maxRedirects = 50;
private int maxConnTotal = 0;
private int maxConnPerRoute = 0;
private String userAgent;
public HttpClientConfigBuilder setConTimeOutMillis(int conTimeOutMillis) { public HttpClientConfigBuilder setConTimeOutMillis(int conTimeOutMillis) {
this.conTimeOutMillis = conTimeOutMillis; this.conTimeOutMillis = conTimeOutMillis;
return this; return this;
@ -69,13 +153,40 @@ public class HttpClientConfig {
return this; return this;
} }
public HttpClientConfigBuilder setConnectionTimeToLive(long connTimeToLive, TimeUnit connTimeToLiveTimeUnit) {
this.connTimeToLive = connTimeToLive;
this.connTimeToLiveTimeUnit = connTimeToLiveTimeUnit;
return this;
}
public HttpClientConfigBuilder setConnectionRequestTimeout(int connectionRequestTimeout) {
this.connectionRequestTimeout = connectionRequestTimeout;
return this;
}
public HttpClientConfigBuilder setMaxRedirects(int maxRedirects) { public HttpClientConfigBuilder setMaxRedirects(int maxRedirects) {
this.maxRedirects = maxRedirects; this.maxRedirects = maxRedirects;
return this; return this;
} }
public HttpClientConfigBuilder setMaxConnTotal(int maxConnTotal) {
this.maxConnTotal = maxConnTotal;
return this;
}
public HttpClientConfigBuilder setMaxConnPerRoute(int maxConnPerRoute) {
this.maxConnPerRoute = maxConnPerRoute;
return this;
}
public HttpClientConfigBuilder setUserAgent(String userAgent) {
this.userAgent = userAgent;
return this;
}
public HttpClientConfig build() { public HttpClientConfig build() {
return new HttpClientConfig(conTimeOutMillis, readTimeOutMillis, maxRedirects); return new HttpClientConfig(conTimeOutMillis, readTimeOutMillis, connTimeToLive, connTimeToLiveTimeUnit,
connectionRequestTimeout, maxRedirects, maxConnTotal, maxConnPerRoute, userAgent);
} }
} }
} }

17
common/src/main/java/com/alibaba/nacos/common/http/HttpUtils.java
View File

@ -16,15 +16,17 @@
package com.alibaba.nacos.common.http; package com.alibaba.nacos.common.http;
import com.alibaba.nacos.common.http.handler.RequestHandler; import com.alibaba.nacos.common.constant.HttpHeaderConsts;
import com.alibaba.nacos.common.http.param.Header; import com.alibaba.nacos.common.http.param.Header;
import com.alibaba.nacos.common.http.param.Query; import com.alibaba.nacos.common.http.param.Query;
import com.alibaba.nacos.common.utils.JacksonUtils;
import com.alibaba.nacos.common.utils.StringUtils; import com.alibaba.nacos.common.utils.StringUtils;
import org.apache.http.HttpEntity; import org.apache.http.HttpEntity;
import org.apache.http.HttpEntityEnclosingRequest; import org.apache.http.HttpEntityEnclosingRequest;
import org.apache.http.NameValuePair; import org.apache.http.NameValuePair;
import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.HttpRequestBase; import org.apache.http.client.methods.HttpRequestBase;
import org.apache.http.entity.ByteArrayEntity;
import org.apache.http.entity.ContentType; import org.apache.http.entity.ContentType;
import org.apache.http.entity.StringEntity; import org.apache.http.entity.StringEntity;
import org.apache.http.message.BasicNameValuePair; import org.apache.http.message.BasicNameValuePair;
@ -70,17 +72,22 @@ public final class HttpUtils {
* *
* @param requestBase requestBase {@link HttpRequestBase} * @param requestBase requestBase {@link HttpRequestBase}
* @param body body * @param body body
* @param mediaType mediaType {@link ContentType} * @param header request header
* @throws Exception exception * @throws Exception exception
*/ */
public static void initRequestEntity(HttpRequestBase requestBase, Object body, String mediaType) throws Exception { public static void initRequestEntity(HttpRequestBase requestBase, Object body, Header header) throws Exception {
if (body == null) { if (body == null) {
return; return;
} }
if (requestBase instanceof HttpEntityEnclosingRequest) { if (requestBase instanceof HttpEntityEnclosingRequest) {
HttpEntityEnclosingRequest request = (HttpEntityEnclosingRequest) requestBase; HttpEntityEnclosingRequest request = (HttpEntityEnclosingRequest) requestBase;
ContentType contentType = ContentType.create(mediaType); ContentType contentType = ContentType.create(header.getValue(HttpHeaderConsts.CONTENT_TYPE), header.getCharset());
StringEntity entity = new StringEntity(RequestHandler.parse(body), contentType); HttpEntity entity;
if (body instanceof byte[]) {
entity = new ByteArrayEntity((byte[]) body, contentType);
} else {
entity = new StringEntity(body instanceof String ? (String) body : JacksonUtils.toJson(body), contentType);
}
request.setEntity(entity); request.setEntity(entity);
} }
} }

21
common/src/main/java/com/alibaba/nacos/common/http/client/NacosAsyncRestTemplate.java
View File

@ -105,6 +105,27 @@ public class NacosAsyncRestTemplate extends AbstractNacosRestTemplate {
execute(url, HttpMethod.DELETE, new RequestHttpEntity(header, query), responseType, callback); execute(url, HttpMethod.DELETE, new RequestHttpEntity(header, query), responseType, callback);
} }
/**
* async http delete large request, when the parameter exceeds the URL limit, you can use this method to put the
* parameter into the body pass.
*
* <p>{@code responseType} can be an RestResult or RestResult data {@code T} type
*
* <p>{@code callback} Result callback execution,
* if you need response headers, you can convert the received RestResult to HttpRestResult.
*
* @param url url
* @param header http header param
* @param body body
* @param responseType return type
* @param callback callback {@link Callback#onReceive(com.alibaba.nacos.common.model.RestResult)}
*/
public <T> void delete(String url, Header header, String body, Type responseType, Callback<T> callback) {
execute(url, HttpMethod.DELETE_LARGE,
new RequestHttpEntity(header.setContentType(MediaType.APPLICATION_JSON), Query.EMPTY, body),
responseType, callback);
}
/** /**
* async http put Create a new resource by PUTting the given body to http request. * async http put Create a new resource by PUTting the given body to http request.
* *

20
common/src/main/java/com/alibaba/nacos/common/http/client/NacosRestTemplate.java
View File

@ -427,6 +427,26 @@ public class NacosRestTemplate extends AbstractNacosRestTemplate {
return execute(url, httpMethod, requestHttpEntity, responseType); return execute(url, httpMethod, requestHttpEntity, responseType);
} }
/**
* Execute the HTTP method to the given URI template, writing the given request entity to the request, and returns
* the response as {@link HttpRestResult}.
*
* @param url url
* @param config HttpClientConfig
* @param header http header param
* @param query http query param
* @param body http body param
* @param httpMethod http method
* @param responseType return type
* @return {@link HttpRestResult}
* @throws Exception ex
*/
public <T> HttpRestResult<T> exchange(String url, HttpClientConfig config, Header header, Query query,
Object body, String httpMethod, Type responseType) throws Exception {
RequestHttpEntity requestHttpEntity = new RequestHttpEntity(config, header, query, body);
return execute(url, httpMethod, requestHttpEntity, responseType);
}
/** /**
* Set the request interceptors that this accessor should use. * Set the request interceptors that this accessor should use.
* *

2
common/src/main/java/com/alibaba/nacos/common/http/client/request/DefaultHttpClientRequest.java
View File

@ -65,7 +65,7 @@ public class DefaultHttpClientRequest implements HttpClientRequest {
&& requestHttpEntity.getBody() instanceof Map) { && requestHttpEntity.getBody() instanceof Map) {
HttpUtils.initRequestFromEntity(httpRequestBase, (Map<String, String>) requestHttpEntity.getBody(), headers.getCharset()); HttpUtils.initRequestFromEntity(httpRequestBase, (Map<String, String>) requestHttpEntity.getBody(), headers.getCharset());
} else { } else {
HttpUtils.initRequestEntity(httpRequestBase, requestHttpEntity.getBody(), headers.getValue(HttpHeaderConsts.CONTENT_TYPE)); HttpUtils.initRequestEntity(httpRequestBase, requestHttpEntity.getBody(), headers);
} }
replaceDefaultConfig(httpRequestBase, requestHttpEntity.getHttpClientConfig()); replaceDefaultConfig(httpRequestBase, requestHttpEntity.getHttpClientConfig());
return httpRequestBase; return httpRequestBase;

2
common/src/main/java/com/alibaba/nacos/common/http/client/request/JdkHttpClientRequest.java
View File

@ -90,7 +90,7 @@ public class JdkHttpClientRequest implements HttpClientRequest {
conn.setConnectTimeout(this.httpClientConfig.getConTimeOutMillis()); conn.setConnectTimeout(this.httpClientConfig.getConTimeOutMillis());
conn.setReadTimeout(this.httpClientConfig.getReadTimeOutMillis()); conn.setReadTimeout(this.httpClientConfig.getReadTimeOutMillis());
conn.setRequestMethod(httpMethod); conn.setRequestMethod(httpMethod);
if (body != null) { if (body != null && !"".equals(body)) {
String contentType = headers.getValue(HttpHeaderConsts.CONTENT_TYPE); String contentType = headers.getValue(HttpHeaderConsts.CONTENT_TYPE);
String bodyStr = JacksonUtils.toJson(body); String bodyStr = JacksonUtils.toJson(body);
if (MediaType.APPLICATION_FORM_URLENCODED.equals(contentType)) { if (MediaType.APPLICATION_FORM_URLENCODED.equals(contentType)) {

5
common/src/main/java/com/alibaba/nacos/common/http/param/Header.java
View File

@ -18,6 +18,7 @@ package com.alibaba.nacos.common.http.param;
import com.alibaba.nacos.api.common.Constants; import com.alibaba.nacos.api.common.Constants;
import com.alibaba.nacos.common.constant.HttpHeaderConsts; import com.alibaba.nacos.common.constant.HttpHeaderConsts;
import com.alibaba.nacos.common.utils.MapUtils;
import com.alibaba.nacos.common.utils.StringUtils; import com.alibaba.nacos.common.utils.StringUtils;
import java.util.ArrayList; import java.util.ArrayList;
@ -129,10 +130,12 @@ public class Header {
* @param params parameters * @param params parameters
*/ */
public void addAll(Map<String, String> params) { public void addAll(Map<String, String> params) {
if (MapUtils.isNotEmpty(params)) {
for (Map.Entry<String, String> entry : params.entrySet()) { for (Map.Entry<String, String> entry : params.entrySet()) {
addParam(entry.getKey(), entry.getValue()); addParam(entry.getKey(), entry.getValue());
} }
} }
}
/** /**
* set original format response header. * set original format response header.
@ -142,11 +145,13 @@ public class Header {
* @param headers original response header * @param headers original response header
*/ */
public void setOriginalResponseHeader(Map<String, List<String>> headers) { public void setOriginalResponseHeader(Map<String, List<String>> headers) {
if (MapUtils.isNotEmpty(headers)) {
this.originalResponseHeader.putAll(headers); this.originalResponseHeader.putAll(headers);
for (Map.Entry<String, List<String>> entry : this.originalResponseHeader.entrySet()) { for (Map.Entry<String, List<String>> entry : this.originalResponseHeader.entrySet()) {
addParam(entry.getKey(), entry.getValue().get(0)); addParam(entry.getKey(), entry.getValue().get(0));
} }
} }
}
/** /**
* get original format response header. * get original format response header.

4
common/src/main/java/com/alibaba/nacos/common/http/param/Query.java
View File

@ -16,6 +16,8 @@
package com.alibaba.nacos.common.http.param; package com.alibaba.nacos.common.http.param;
import com.alibaba.nacos.common.utils.MapUtils;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
@ -68,9 +70,11 @@ public class Query {
* @return this query * @return this query
*/ */
public Query initParams(Map<String, String> params) { public Query initParams(Map<String, String> params) {
if (MapUtils.isNotEmpty(params)) {
for (Map.Entry<String, String> entry : params.entrySet()) { for (Map.Entry<String, String> entry : params.entrySet()) {
addParam(entry.getKey(), entry.getValue()); addParam(entry.getKey(), entry.getValue());
} }
}
return this; return this;
} }

3
common/src/main/java/com/alibaba/nacos/common/model/RequestHttpEntity.java
View File

@ -26,7 +26,6 @@ import java.util.Map;
* Represents an HTTP request , consisting of headers and body. * Represents an HTTP request , consisting of headers and body.
* *
* @author mai.jh * @author mai.jh
* @date 2020/5/23
*/ */
public class RequestHttpEntity { public class RequestHttpEntity {
@ -36,7 +35,7 @@ public class RequestHttpEntity {
private final Query query; private final Query query;
private Object body; private final Object body;
public RequestHttpEntity(Header header, Query query) { public RequestHttpEntity(Header header, Query query) {
this(null, header, query); this(null, header, query);

12
common/src/main/java/com/alibaba/nacos/common/utils/HttpMethod.java
View File

@ -26,8 +26,10 @@ public class HttpMethod {
public static final String GET = "GET"; public static final String GET = "GET";
// this is only use in nacos, Custom request type, essentially a get request /**
* this is only use in nacos, Custom request type, essentially a GET request, Mainly used for GET request parameters
* are relatively large,can not be placed on the URL, so it needs to be placed in the body.
*/
public static final String GET_LARGE = "GET-LARGE"; public static final String GET_LARGE = "GET-LARGE";
public static final String HEAD = "HEAD"; public static final String HEAD = "HEAD";
@ -40,6 +42,12 @@ public class HttpMethod {
public static final String DELETE = "DELETE"; public static final String DELETE = "DELETE";
/**
* this is only use in nacos, Custom request type, essentially a DELETE request, Mainly used for DELETE request
* parameters are relatively large, can not be placed on the URL, so it needs to be placed in the body.
*/
public static final String DELETE_LARGE = "DELETE_LARGE";
public static final String OPTIONS = "OPTIONS"; public static final String OPTIONS = "OPTIONS";
public static final String TRACE = "TRACE"; public static final String TRACE = "TRACE";

2
core/src/main/java/com/alibaba/nacos/core/distributed/distro/task/load/DistroLoadDataTask.java
View File

@ -109,7 +109,7 @@ public class DistroLoadDataTask implements Runnable {
return true; return true;
} }
} catch (Exception e) { } catch (Exception e) {
Loggers.DISTRO.error("[DISTRO-INIT] load snapshot {} from {} failed.", resourceType, each.getAddress()); Loggers.DISTRO.error("[DISTRO-INIT] load snapshot {} from {} failed.", resourceType, each.getAddress(), e);
} }
} }
return false; return false;

123
naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftCore.java
View File

@ -18,11 +18,13 @@ package com.alibaba.nacos.naming.consistency.persistent.raft;
import com.alibaba.nacos.common.executor.ExecutorFactory; import com.alibaba.nacos.common.executor.ExecutorFactory;
import com.alibaba.nacos.common.executor.NameThreadFactory; import com.alibaba.nacos.common.executor.NameThreadFactory;
import com.alibaba.nacos.common.http.Callback;
import com.alibaba.nacos.common.model.RestResult;
import com.alibaba.nacos.common.utils.JacksonUtils; import com.alibaba.nacos.common.utils.JacksonUtils;
import com.alibaba.nacos.consistency.DataOperation;
import com.alibaba.nacos.core.utils.ApplicationUtils; import com.alibaba.nacos.core.utils.ApplicationUtils;
import com.alibaba.nacos.core.utils.ClassUtils; import com.alibaba.nacos.core.utils.ClassUtils;
import com.alibaba.nacos.naming.NamingApp; import com.alibaba.nacos.naming.NamingApp;
import com.alibaba.nacos.consistency.DataOperation;
import com.alibaba.nacos.naming.consistency.Datum; import com.alibaba.nacos.naming.consistency.Datum;
import com.alibaba.nacos.naming.consistency.KeyBuilder; import com.alibaba.nacos.naming.consistency.KeyBuilder;
import com.alibaba.nacos.naming.consistency.RecordListener; import com.alibaba.nacos.naming.consistency.RecordListener;
@ -41,8 +43,6 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.ObjectNode;
import com.ning.http.client.AsyncCompletionHandler;
import com.ning.http.client.Response;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils; import org.apache.commons.lang3.math.NumberUtils;
import org.javatuples.Pair; import org.javatuples.Pair;
@ -55,7 +55,6 @@ import javax.annotation.PostConstruct;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.HttpURLConnection;
import java.net.URLDecoder; import java.net.URLDecoder;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
@ -223,23 +222,26 @@ public class RaftCore {
continue; continue;
} }
final String url = buildUrl(server, API_ON_PUB); final String url = buildUrl(server, API_ON_PUB);
HttpClient.asyncHttpPostLarge(url, Arrays.asList("key=" + key), content, HttpClient.asyncHttpPostLarge(url, Arrays.asList("key", key), content, new Callback<String>() {
new AsyncCompletionHandler<Integer>() {
@Override @Override
public Integer onCompleted(Response response) throws Exception { public void onReceive(RestResult<String> result) {
if (response.getStatusCode() != HttpURLConnection.HTTP_OK) { if (!result.ok()) {
Loggers.RAFT Loggers.RAFT
.warn("[RAFT] failed to publish data to peer, datumId={}, peer={}, http code={}", .warn("[RAFT] failed to publish data to peer, datumId={}, peer={}, http code={}",
datum.key, server, response.getStatusCode()); datum.key, server, result.getCode());
return 1; return;
} }
latch.countDown(); latch.countDown();
return 0;
} }
@Override @Override
public STATE onContentWriteCompleted() { public void onError(Throwable throwable) {
return STATE.CONTINUE; Loggers.RAFT.error("[RAFT] failed to publish data to peer", throwable);
}
@Override
public void onCancel() {
} }
}); });
@ -287,21 +289,29 @@ public class RaftCore {
for (final String server : peers.allServersWithoutMySelf()) { for (final String server : peers.allServersWithoutMySelf()) {
String url = buildUrl(server, API_ON_DEL); String url = buildUrl(server, API_ON_DEL);
HttpClient.asyncHttpDeleteLarge(url, null, json.toString(), new AsyncCompletionHandler<Integer>() { HttpClient.asyncHttpDeleteLarge(url, null, json.toString(), new Callback<String>() {
@Override @Override
public Integer onCompleted(Response response) throws Exception { public void onReceive(RestResult<String> result) {
if (response.getStatusCode() != HttpURLConnection.HTTP_OK) { if (!result.ok()) {
Loggers.RAFT Loggers.RAFT
.warn("[RAFT] failed to delete data from peer, datumId={}, peer={}, http code={}", .warn("[RAFT] failed to delete data from peer, datumId={}, peer={}, http code={}",
key, server, response.getStatusCode()); key, server, result.getCode());
return 1; return;
} }
RaftPeer local = peers.local(); RaftPeer local = peers.local();
local.resetLeaderDue(); local.resetLeaderDue();
}
@Override
public void onError(Throwable throwable) {
Loggers.RAFT.error("[RAFT] failed to delete data from peer", throwable);
}
@Override
public void onCancel() {
return 0;
} }
}); });
} }
@ -458,22 +468,30 @@ public class RaftCore {
for (final String server : peers.allServersWithoutMySelf()) { for (final String server : peers.allServersWithoutMySelf()) {
final String url = buildUrl(server, API_VOTE); final String url = buildUrl(server, API_VOTE);
try { try {
HttpClient.asyncHttpPost(url, null, params, new AsyncCompletionHandler<Integer>() { HttpClient.asyncHttpPost(url, null, params, new Callback<String>() {
@Override @Override
public Integer onCompleted(Response response) throws Exception { public void onReceive(RestResult<String> result) {
if (response.getStatusCode() != HttpURLConnection.HTTP_OK) { if (!result.ok()) {
Loggers.RAFT Loggers.RAFT.error("NACOS-RAFT vote failed: {}, url: {}", result.getCode(), url);
.error("NACOS-RAFT vote failed: {}, url: {}", response.getResponseBody(), url); return;
return 1;
} }
RaftPeer peer = JacksonUtils.toObj(response.getResponseBody(), RaftPeer.class); RaftPeer peer = JacksonUtils.toObj(result.getData(), RaftPeer.class);
Loggers.RAFT.info("received approve from peer: {}", JacksonUtils.toJson(peer)); Loggers.RAFT.info("received approve from peer: {}", JacksonUtils.toJson(peer));
peers.decideLeader(peer); peers.decideLeader(peer);
return 0; }
@Override
public void onError(Throwable throwable) {
Loggers.RAFT.error("error while sending vote to server: {}", server, throwable);
}
@Override
public void onCancel() {
} }
}); });
} catch (Exception e) { } catch (Exception e) {
@ -605,28 +623,32 @@ public class RaftCore {
if (Loggers.RAFT.isDebugEnabled()) { if (Loggers.RAFT.isDebugEnabled()) {
Loggers.RAFT.debug("send beat to server " + server); Loggers.RAFT.debug("send beat to server " + server);
} }
HttpClient.asyncHttpPostLarge(url, null, compressedBytes, new AsyncCompletionHandler<Integer>() { HttpClient.asyncHttpPostLarge(url, null, compressedBytes, new Callback<String>() {
@Override @Override
public Integer onCompleted(Response response) throws Exception { public void onReceive(RestResult<String> result) {
if (response.getStatusCode() != HttpURLConnection.HTTP_OK) { if (!result.ok()) {
Loggers.RAFT.error("NACOS-RAFT beat failed: {}, peer: {}", response.getResponseBody(), Loggers.RAFT.error("NACOS-RAFT beat failed: {}, peer: {}", result.getCode(), server);
server);
MetricsMonitor.getLeaderSendBeatFailedException().increment(); MetricsMonitor.getLeaderSendBeatFailedException().increment();
return 1; return;
} }
peers.update(JacksonUtils.toObj(response.getResponseBody(), RaftPeer.class)); peers.update(JacksonUtils.toObj(result.getData(), RaftPeer.class));
if (Loggers.RAFT.isDebugEnabled()) { if (Loggers.RAFT.isDebugEnabled()) {
Loggers.RAFT.debug("receive beat response from: {}", url); Loggers.RAFT.debug("receive beat response from: {}", url);
} }
return 0;
} }
@Override @Override
public void onThrowable(Throwable t) { public void onError(Throwable throwable) {
Loggers.RAFT.error("NACOS-RAFT error while sending heart-beat to peer: {} {}", server, t); Loggers.RAFT.error("NACOS-RAFT error while sending heart-beat to peer: {} {}", server,
throwable);
MetricsMonitor.getLeaderSendBeatFailedException().increment(); MetricsMonitor.getLeaderSendBeatFailedException().increment();
} }
@Override
public void onCancel() {
}
}); });
} catch (Exception e) { } catch (Exception e) {
Loggers.RAFT.error("error while sending heart-beat to peer: {} {}", server, e); Loggers.RAFT.error("error while sending heart-beat to peer: {} {}", server, e);
@ -746,15 +768,15 @@ public class RaftCore {
// update datum entry // update datum entry
String url = buildUrl(remote.ip, API_GET) + "?keys=" + URLEncoder.encode(keys, "UTF-8"); String url = buildUrl(remote.ip, API_GET) + "?keys=" + URLEncoder.encode(keys, "UTF-8");
HttpClient.asyncHttpGet(url, null, null, new AsyncCompletionHandler<Integer>() { HttpClient.asyncHttpGet(url, null, null, new Callback<String>() {
@Override @Override
public Integer onCompleted(Response response) throws Exception { public void onReceive(RestResult<String> result) {
if (response.getStatusCode() != HttpURLConnection.HTTP_OK) { if (!result.ok()) {
return 1; return;
} }
List<JsonNode> datumList = JacksonUtils List<JsonNode> datumList = JacksonUtils
.toObj(response.getResponseBody(), new TypeReference<List<JsonNode>>() { .toObj(result.getData(), new TypeReference<List<JsonNode>>() {
}); });
for (JsonNode datumJson : datumList) { for (JsonNode datumJson : datumList) {
@ -823,9 +845,24 @@ public class RaftCore {
OPERATE_LOCK.unlock(); OPERATE_LOCK.unlock();
} }
} }
try {
TimeUnit.MILLISECONDS.sleep(200); TimeUnit.MILLISECONDS.sleep(200);
return 0; } catch (InterruptedException e) {
Loggers.RAFT.error("[RAFT-BEAT] Interrupted error ", e);
} }
return;
}
@Override
public void onError(Throwable throwable) {
Loggers.RAFT.error("[RAFT-BEAT] failed to sync datum from leader", throwable);
}
@Override
public void onCancel() {
}
}); });
batch.clear(); batch.clear();

27
naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftPeerSet.java
View File

@ -16,6 +16,8 @@
package com.alibaba.nacos.naming.consistency.persistent.raft; package com.alibaba.nacos.naming.consistency.persistent.raft;
import com.alibaba.nacos.common.http.Callback;
import com.alibaba.nacos.common.model.RestResult;
import com.alibaba.nacos.common.notify.NotifyCenter; import com.alibaba.nacos.common.notify.NotifyCenter;
import com.alibaba.nacos.common.utils.JacksonUtils; import com.alibaba.nacos.common.utils.JacksonUtils;
import com.alibaba.nacos.core.cluster.Member; import com.alibaba.nacos.core.cluster.Member;
@ -26,8 +28,6 @@ import com.alibaba.nacos.core.utils.ApplicationUtils;
import com.alibaba.nacos.naming.misc.HttpClient; import com.alibaba.nacos.naming.misc.HttpClient;
import com.alibaba.nacos.naming.misc.Loggers; import com.alibaba.nacos.naming.misc.Loggers;
import com.alibaba.nacos.naming.misc.NetUtils; import com.alibaba.nacos.naming.misc.NetUtils;
import com.ning.http.client.AsyncCompletionHandler;
import com.ning.http.client.Response;
import org.apache.commons.collections.SortedBag; import org.apache.commons.collections.SortedBag;
import org.apache.commons.collections.bag.TreeBag; import org.apache.commons.collections.bag.TreeBag;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -35,7 +35,6 @@ import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import java.net.HttpURLConnection;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
@ -219,20 +218,28 @@ public class RaftPeerSet extends MemberChangeListener {
if (!Objects.equals(peer, candidate) && peer.state == RaftPeer.State.LEADER) { if (!Objects.equals(peer, candidate) && peer.state == RaftPeer.State.LEADER) {
try { try {
String url = RaftCore.buildUrl(peer.ip, RaftCore.API_GET_PEER); String url = RaftCore.buildUrl(peer.ip, RaftCore.API_GET_PEER);
HttpClient.asyncHttpGet(url, null, params, new AsyncCompletionHandler<Integer>() { HttpClient.asyncHttpGet(url, null, params, new Callback<String>() {
@Override @Override
public Integer onCompleted(Response response) throws Exception { public void onReceive(RestResult<String> result) {
if (response.getStatusCode() != HttpURLConnection.HTTP_OK) { if (!result.ok()) {
Loggers.RAFT Loggers.RAFT
.error("[NACOS-RAFT] get peer failed: {}, peer: {}", response.getResponseBody(), .error("[NACOS-RAFT] get peer failed: {}, peer: {}", result.getCode(),
peer.ip); peer.ip);
peer.state = RaftPeer.State.FOLLOWER; peer.state = RaftPeer.State.FOLLOWER;
return 1; return;
} }
update(JacksonUtils.toObj(response.getResponseBody(), RaftPeer.class)); update(JacksonUtils.toObj(result.getData(), RaftPeer.class));
}
@Override
public void onError(Throwable throwable) {
}
@Override
public void onCancel() {
return 0;
} }
}); });
} catch (Exception e) { } catch (Exception e) {

20
naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftProxy.java
View File

@ -16,13 +16,13 @@
package com.alibaba.nacos.naming.consistency.persistent.raft; package com.alibaba.nacos.naming.consistency.persistent.raft;
import com.alibaba.nacos.common.model.RestResult;
import com.alibaba.nacos.core.utils.ApplicationUtils; import com.alibaba.nacos.core.utils.ApplicationUtils;
import com.alibaba.nacos.naming.misc.HttpClient; import com.alibaba.nacos.naming.misc.HttpClient;
import com.alibaba.nacos.naming.misc.UtilsAndCommons; import com.alibaba.nacos.naming.misc.UtilsAndCommons;
import org.springframework.http.HttpMethod; import org.springframework.http.HttpMethod;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.net.HttpURLConnection;
import java.util.Map; import java.util.Map;
/** /**
@ -48,9 +48,9 @@ public class RaftProxy {
} }
String url = "http://" + server + ApplicationUtils.getContextPath() + api; String url = "http://" + server + ApplicationUtils.getContextPath() + api;
HttpClient.HttpResult result = HttpClient.httpGet(url, null, params); RestResult<String> result = HttpClient.httpGet(url, null, params);
if (result.code != HttpURLConnection.HTTP_OK) { if (!result.ok()) {
throw new IllegalStateException("leader failed, caused by: " + result.content); throw new IllegalStateException("leader failed, caused by: " + result.getMessage());
} }
} }
@ -69,7 +69,7 @@ public class RaftProxy {
server = server + UtilsAndCommons.IP_PORT_SPLITER + ApplicationUtils.getPort(); server = server + UtilsAndCommons.IP_PORT_SPLITER + ApplicationUtils.getPort();
} }
String url = "http://" + server + ApplicationUtils.getContextPath() + api; String url = "http://" + server + ApplicationUtils.getContextPath() + api;
HttpClient.HttpResult result; RestResult<String> result;
switch (method) { switch (method) {
case GET: case GET:
result = HttpClient.httpGet(url, null, params); result = HttpClient.httpGet(url, null, params);
@ -84,8 +84,8 @@ public class RaftProxy {
throw new RuntimeException("unsupported method:" + method); throw new RuntimeException("unsupported method:" + method);
} }
if (result.code != HttpURLConnection.HTTP_OK) { if (!result.ok()) {
throw new IllegalStateException("leader failed, caused by: " + result.content); throw new IllegalStateException("leader failed, caused by: " + result.getMessage());
} }
} }
@ -106,9 +106,9 @@ public class RaftProxy {
} }
String url = "http://" + server + ApplicationUtils.getContextPath() + api; String url = "http://" + server + ApplicationUtils.getContextPath() + api;
HttpClient.HttpResult result = HttpClient.httpPostLarge(url, headers, content); RestResult<String> result = HttpClient.httpPostLarge(url, headers, content);
if (result.code != HttpURLConnection.HTTP_OK) { if (!result.ok()) {
throw new IllegalStateException("leader failed, caused by: " + result.content); throw new IllegalStateException("leader failed, caused by: " + result.getMessage());
} }
} }
} }

8
naming/src/main/java/com/alibaba/nacos/naming/core/SubscribeManager.java
View File

@ -17,6 +17,7 @@
package com.alibaba.nacos.naming.core; package com.alibaba.nacos.naming.core;
import com.alibaba.nacos.api.naming.CommonParams; import com.alibaba.nacos.api.naming.CommonParams;
import com.alibaba.nacos.common.model.RestResult;
import com.alibaba.nacos.common.utils.JacksonUtils; import com.alibaba.nacos.common.utils.JacksonUtils;
import com.alibaba.nacos.core.cluster.Member; import com.alibaba.nacos.core.cluster.Member;
import com.alibaba.nacos.core.cluster.ServerMemberManager; import com.alibaba.nacos.core.cluster.ServerMemberManager;
@ -31,7 +32,6 @@ import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.net.HttpURLConnection;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
@ -97,13 +97,13 @@ public class SubscribeManager {
continue; continue;
} }
HttpClient.HttpResult result = HttpClient.httpGet( RestResult<String> result = HttpClient.httpGet(
"http://" + server.getAddress() + ApplicationUtils.getContextPath() "http://" + server.getAddress() + ApplicationUtils.getContextPath()
+ UtilsAndCommons.NACOS_NAMING_CONTEXT + SUBSCRIBER_ON_SYNC_URL, new ArrayList<>(), + UtilsAndCommons.NACOS_NAMING_CONTEXT + SUBSCRIBER_ON_SYNC_URL, new ArrayList<>(),
paramValues); paramValues);
if (HttpURLConnection.HTTP_OK == result.code) { if (!result.ok()) {
Subscribers subscribers = JacksonUtils.toObj(result.content, Subscribers.class); Subscribers subscribers = JacksonUtils.toObj(result.getData(), Subscribers.class);
subscriberList.addAll(subscribers.getSubscribers()); subscriberList.addAll(subscribers.getSubscribers());
} }
} }

26
naming/src/main/java/com/alibaba/nacos/naming/healthcheck/ClientBeatCheckTask.java
View File

@ -16,6 +16,8 @@
package com.alibaba.nacos.naming.healthcheck; package com.alibaba.nacos.naming.healthcheck;
import com.alibaba.nacos.common.http.Callback;
import com.alibaba.nacos.common.model.RestResult;
import com.alibaba.nacos.common.utils.JacksonUtils; import com.alibaba.nacos.common.utils.JacksonUtils;
import com.alibaba.nacos.core.utils.ApplicationUtils; import com.alibaba.nacos.core.utils.ApplicationUtils;
import com.alibaba.nacos.naming.consistency.KeyBuilder; import com.alibaba.nacos.naming.consistency.KeyBuilder;
@ -31,10 +33,7 @@ import com.alibaba.nacos.naming.misc.SwitchDomain;
import com.alibaba.nacos.naming.misc.UtilsAndCommons; import com.alibaba.nacos.naming.misc.UtilsAndCommons;
import com.alibaba.nacos.naming.push.PushService; import com.alibaba.nacos.naming.push.PushService;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.ning.http.client.AsyncCompletionHandler;
import com.ning.http.client.Response;
import java.net.HttpURLConnection;
import java.util.List; import java.util.List;
/** /**
@ -140,15 +139,26 @@ public class ClientBeatCheckTask implements Runnable {
+ UtilsAndCommons.NACOS_NAMING_CONTEXT + "/instance?" + request.toUrl(); + UtilsAndCommons.NACOS_NAMING_CONTEXT + "/instance?" + request.toUrl();
// delete instance asynchronously: // delete instance asynchronously:
HttpClient.asyncHttpDelete(url, null, null, new AsyncCompletionHandler() { HttpClient.asyncHttpDelete(url, null, null, new Callback<String>() {
@Override @Override
public Object onCompleted(Response response) throws Exception { public void onReceive(RestResult<String> result) {
if (response.getStatusCode() != HttpURLConnection.HTTP_OK) { if (!result.ok()) {
Loggers.SRV_LOG Loggers.SRV_LOG
.error("[IP-DEAD] failed to delete ip automatically, ip: {}, caused {}, resp code: {}", .error("[IP-DEAD] failed to delete ip automatically, ip: {}, caused {}, resp code: {}",
instance.toJson(), response.getResponseBody(), response.getStatusCode()); instance.toJson(), result.getMessage(), result.getCode());
} }
return null; }
@Override
public void onError(Throwable throwable) {
Loggers.SRV_LOG
.error("[IP-DEAD] failed to delete ip automatically, ip: {}, error: {}", instance.toJson(),
throwable);
}
@Override
public void onCancel() {
} }
}); });

6
naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HealthCheckCommon.java
View File

@ -16,6 +16,7 @@
package com.alibaba.nacos.naming.healthcheck; package com.alibaba.nacos.naming.healthcheck;
import com.alibaba.nacos.common.model.RestResult;
import com.alibaba.nacos.common.utils.JacksonUtils; import com.alibaba.nacos.common.utils.JacksonUtils;
import com.alibaba.nacos.core.cluster.Member; import com.alibaba.nacos.core.cluster.Member;
import com.alibaba.nacos.core.cluster.ServerMemberManager; import com.alibaba.nacos.core.cluster.ServerMemberManager;
@ -34,7 +35,6 @@ import com.alibaba.nacos.naming.push.PushService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.net.HttpURLConnection;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
@ -92,11 +92,11 @@ public class HealthCheckCommon {
JacksonUtils.toJson(list)); JacksonUtils.toJson(list));
} }
HttpClient.HttpResult httpResult = HttpClient.httpPost( RestResult<String> httpResult = HttpClient.httpPost(
"http://" + server.getAddress() + ApplicationUtils.getContextPath() "http://" + server.getAddress() + ApplicationUtils.getContextPath()
+ UtilsAndCommons.NACOS_NAMING_CONTEXT + "/api/healthCheckResult", null, params); + UtilsAndCommons.NACOS_NAMING_CONTEXT + "/api/healthCheckResult", null, params);
if (httpResult.code != HttpURLConnection.HTTP_OK) { if (!httpResult.ok()) {
Loggers.EVT_LOG.warn("[HEALTH-CHECK-SYNC] failed to send result to {}, result: {}", server, Loggers.EVT_LOG.warn("[HEALTH-CHECK-SYNC] failed to send result to {}, result: {}", server,
JacksonUtils.toJson(list)); JacksonUtils.toJson(list));
} }

566
naming/src/main/java/com/alibaba/nacos/naming/misc/HttpClient.java
View File

@ -17,49 +17,24 @@
package com.alibaba.nacos.naming.misc; package com.alibaba.nacos.naming.misc;
import com.alibaba.nacos.common.constant.HttpHeaderConsts; import com.alibaba.nacos.common.constant.HttpHeaderConsts;
import com.alibaba.nacos.common.http.Callback;
import com.alibaba.nacos.common.http.HttpClientConfig;
import com.alibaba.nacos.common.http.client.NacosAsyncRestTemplate;
import com.alibaba.nacos.common.http.client.NacosRestTemplate;
import com.alibaba.nacos.common.http.param.Header;
import com.alibaba.nacos.common.http.param.MediaType;
import com.alibaba.nacos.common.http.param.Query;
import com.alibaba.nacos.common.model.RestResult;
import com.alibaba.nacos.common.utils.HttpMethod; import com.alibaba.nacos.common.utils.HttpMethod;
import com.alibaba.nacos.common.utils.IoUtils;
import com.alibaba.nacos.common.utils.VersionUtils; import com.alibaba.nacos.common.utils.VersionUtils;
import com.alibaba.nacos.core.utils.ApplicationUtils; import com.alibaba.nacos.core.utils.ApplicationUtils;
import com.ning.http.client.AsyncCompletionHandler;
import com.ning.http.client.AsyncHttpClient;
import com.ning.http.client.AsyncHttpClientConfig;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.http.HeaderElement;
import org.apache.http.HttpEntity;
import org.apache.http.HttpHeaders;
import org.apache.http.HttpResponse;
import org.apache.http.NameValuePair;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpPut;
import org.apache.http.entity.ByteArrayEntity;
import org.apache.http.entity.ContentType;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.message.BasicNameValuePair;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.HttpURLConnection;
import java.net.URI;
import java.net.URL;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.zip.GZIPInputStream;
/** /**
* Http Client. * Http Client.
@ -72,34 +47,11 @@ public class HttpClient {
private static final int CON_TIME_OUT_MILLIS = 5000; private static final int CON_TIME_OUT_MILLIS = 5000;
private static AsyncHttpClient asyncHttpClient; private static final NacosRestTemplate SYNC_NACOS_REST_TEMPLATE = HttpClientManager.getNacosRestTemplate();
private static CloseableHttpClient postClient; private static final NacosRestTemplate APACHE_SYNC_NACOS_REST_TEMPLATE = HttpClientManager.getApacheRestTemplate();
static { private static final NacosAsyncRestTemplate ASYNC_REST_TEMPLATE = HttpClientManager.getAsyncRestTemplate();
AsyncHttpClientConfig.Builder builder = new AsyncHttpClientConfig.Builder();
builder.setMaximumConnectionsTotal(-1);
builder.setMaximumConnectionsPerHost(128);
builder.setAllowPoolingConnection(true);
builder.setFollowRedirects(false);
builder.setIdleConnectionTimeoutInMs(TIME_OUT_MILLIS);
builder.setConnectionTimeoutInMs(CON_TIME_OUT_MILLIS);
builder.setCompressionEnabled(true);
builder.setIOThreadMultiplier(1);
builder.setMaxRequestRetry(0);
builder.setUserAgent(UtilsAndCommons.SERVER_VERSION);
asyncHttpClient = new AsyncHttpClient(builder.build());
HttpClientBuilder builder2 = HttpClients.custom();
builder2.setUserAgent(UtilsAndCommons.SERVER_VERSION);
builder2.setConnectionTimeToLive(CON_TIME_OUT_MILLIS, TimeUnit.MILLISECONDS);
builder2.setMaxConnPerRoute(-1);
builder2.setMaxConnTotal(-1);
builder2.disableAutomaticRetries();
postClient = builder2.build();
}
/** /**
* Request http delete method. * Request http delete method.
@ -107,11 +59,11 @@ public class HttpClient {
* @param url url * @param url url
* @param headers headers * @param headers headers
* @param paramValues params * @param paramValues params
* @return {@link HttpResult} as response * @return {@link RestResult} as response
*/ */
public static HttpResult httpDelete(String url, List<String> headers, Map<String, String> paramValues) { public static RestResult<String> httpDelete(String url, List<String> headers, Map<String, String> paramValues) {
return request(url, headers, paramValues, StringUtils.EMPTY, CON_TIME_OUT_MILLIS, TIME_OUT_MILLIS, "UTF-8", return request(url, headers, paramValues, StringUtils.EMPTY, CON_TIME_OUT_MILLIS, TIME_OUT_MILLIS, "UTF-8",
"DELETE"); HttpMethod.DELETE);
} }
/** /**
@ -120,11 +72,11 @@ public class HttpClient {
* @param url url * @param url url
* @param headers headers * @param headers headers
* @param paramValues params * @param paramValues params
* @return {@link HttpResult} as response * @return {@link RestResult} as response
*/ */
public static HttpResult httpGet(String url, List<String> headers, Map<String, String> paramValues) { public static RestResult<String> httpGet(String url, List<String> headers, Map<String, String> paramValues) {
return request(url, headers, paramValues, StringUtils.EMPTY, CON_TIME_OUT_MILLIS, TIME_OUT_MILLIS, "UTF-8", return request(url, headers, paramValues, StringUtils.EMPTY, CON_TIME_OUT_MILLIS, TIME_OUT_MILLIS, "UTF-8",
"GET"); HttpMethod.GET);
} }
/** /**
@ -138,39 +90,31 @@ public class HttpClient {
* @param readTimeout timeout of request * @param readTimeout timeout of request
* @param encoding charset of request * @param encoding charset of request
* @param method http method * @param method http method
* @return {@link HttpResult} as response * @return {@link RestResult} as response
*/ */
public static HttpResult request(String url, List<String> headers, Map<String, String> paramValues, String body, public static RestResult<String> request(String url, List<String> headers, Map<String, String> paramValues,
int connectTimeout, int readTimeout, String encoding, String method) { String body, int connectTimeout, int readTimeout, String encoding, String method) {
HttpURLConnection conn = null; Header header = Header.newInstance();
try { if (CollectionUtils.isNotEmpty(headers)) {
String encodedContent = encodingParams(paramValues, encoding); header.addAll(headers);
url += StringUtils.isBlank(encodedContent) ? StringUtils.EMPTY : ("?" + encodedContent);
conn = (HttpURLConnection) new URL(url).openConnection();
conn.setConnectTimeout(connectTimeout);
conn.setReadTimeout(readTimeout);
conn.setRequestMethod(method);
setHeaders(conn, headers, encoding);
if (StringUtils.isNotBlank(body)) {
conn.setDoOutput(true);
byte[] b = body.getBytes();
conn.setRequestProperty("Content-Length", String.valueOf(b.length));
conn.getOutputStream().write(b, 0, b.length);
conn.getOutputStream().flush();
conn.getOutputStream().close();
} }
header.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
header.addParam(HttpHeaderConsts.CLIENT_VERSION_HEADER, VersionUtils.version);
header.addParam(HttpHeaderConsts.USER_AGENT_HEADER, UtilsAndCommons.SERVER_VERSION);
header.addParam(HttpHeaderConsts.REQUEST_SOURCE_HEADER, ApplicationUtils.getLocalAddress());
header.addParam(HttpHeaderConsts.ACCEPT_CHARSET, encoding);
conn.connect(); HttpClientConfig httpClientConfig = HttpClientConfig.builder().setConTimeOutMillis(connectTimeout)
.setReadTimeOutMillis(readTimeout).build();
return getResult(conn); Query query = Query.newInstance().initParams(paramValues);
query.addParam("encoding", "UTF-8");
query.addParam("nofix", "1");
try {
return SYNC_NACOS_REST_TEMPLATE
.exchange(url, httpClientConfig, header, query, body, method, String.class);
} catch (Exception e) { } catch (Exception e) {
Loggers.SRV_LOG.warn("Exception while request: {}, caused: {}", url, e); Loggers.SRV_LOG.warn("Exception while request: {}, caused: {}", url, e);
return new HttpResult(500, e.toString(), Collections.<String, String>emptyMap()); return RestResult.<String>builder().withCode(500).withMsg(e.toString()).build();
} finally {
IoUtils.closeQuietly(conn);
} }
} }
@ -180,11 +124,11 @@ public class HttpClient {
* @param url url * @param url url
* @param headers headers * @param headers headers
* @param paramValues params * @param paramValues params
* @param handler callback after request execute * @param callback callback after request execute
*/ */
public static void asyncHttpGet(String url, List<String> headers, Map<String, String> paramValues, public static void asyncHttpGet(String url, List<String> headers, Map<String, String> paramValues,
AsyncCompletionHandler handler) throws Exception { Callback<String> callback) throws Exception {
asyncHttpRequest(url, headers, paramValues, handler, HttpMethod.GET); asyncHttpRequest(url, headers, paramValues, callback, HttpMethod.GET);
} }
/** /**
@ -193,11 +137,11 @@ public class HttpClient {
* @param url url * @param url url
* @param headers headers * @param headers headers
* @param paramValues params * @param paramValues params
* @param handler callback after request execute * @param callback callback after request execute
*/ */
public static void asyncHttpPost(String url, List<String> headers, Map<String, String> paramValues, public static void asyncHttpPost(String url, List<String> headers, Map<String, String> paramValues,
AsyncCompletionHandler handler) throws Exception { Callback<String> callback) throws Exception {
asyncHttpRequest(url, headers, paramValues, handler, HttpMethod.POST); asyncHttpRequest(url, headers, paramValues, callback, HttpMethod.POST);
} }
/** /**
@ -206,11 +150,11 @@ public class HttpClient {
* @param url url * @param url url
* @param headers headers * @param headers headers
* @param paramValues params * @param paramValues params
* @param handler callback after request execute * @param callback callback after request execute
*/ */
public static void asyncHttpDelete(String url, List<String> headers, Map<String, String> paramValues, public static void asyncHttpDelete(String url, List<String> headers, Map<String, String> paramValues,
AsyncCompletionHandler handler) throws Exception { Callback<String> callback) throws Exception {
asyncHttpRequest(url, headers, paramValues, handler, HttpMethod.DELETE); asyncHttpRequest(url, headers, paramValues, callback, HttpMethod.DELETE);
} }
/** /**
@ -223,44 +167,34 @@ public class HttpClient {
* @throws Exception exception when request * @throws Exception exception when request
*/ */
public static void asyncHttpRequest(String url, List<String> headers, Map<String, String> paramValues, public static void asyncHttpRequest(String url, List<String> headers, Map<String, String> paramValues,
AsyncCompletionHandler handler, String method) throws Exception { Callback<String> callback, String method) throws Exception {
if (!MapUtils.isEmpty(paramValues)) {
String encodedContent = encodingParams(paramValues, "UTF-8");
url += (null == encodedContent) ? "" : ("?" + encodedContent);
}
AsyncHttpClient.BoundRequestBuilder builder; Query query = Query.newInstance().initParams(paramValues);
query.addParam("encoding", "UTF-8");
query.addParam("nofix", "1");
Header header = Header.newInstance();
if (CollectionUtils.isNotEmpty(headers)) {
header.addAll(headers);
}
header.addParam(HttpHeaderConsts.ACCEPT_CHARSET, "UTF-8");
switch (method) { switch (method) {
case HttpMethod.GET: case HttpMethod.GET:
builder = asyncHttpClient.prepareGet(url); ASYNC_REST_TEMPLATE.get(url, header, query, String.class, callback);
break; break;
case HttpMethod.POST: case HttpMethod.POST:
builder = asyncHttpClient.preparePost(url); ASYNC_REST_TEMPLATE.postForm(url, header, paramValues, String.class, callback);
break; break;
case HttpMethod.PUT: case HttpMethod.PUT:
builder = asyncHttpClient.preparePut(url); ASYNC_REST_TEMPLATE.putForm(url, header, paramValues, String.class, callback);
break; break;
case HttpMethod.DELETE: case HttpMethod.DELETE:
builder = asyncHttpClient.prepareDelete(url); ASYNC_REST_TEMPLATE.delete(url, header, query, String.class, callback);
break; break;
default: default:
throw new RuntimeException("not supported method:" + method); throw new RuntimeException("not supported method:" + method);
} }
if (!CollectionUtils.isEmpty(headers)) {
for (String header : headers) {
builder.setHeader(header.split("=")[0], header.split("=")[1]);
}
}
builder.setHeader("Accept-Charset", "UTF-8");
if (handler != null) {
builder.execute(handler);
} else {
builder.execute();
}
} }
/** /**
@ -269,11 +203,11 @@ public class HttpClient {
* @param url url * @param url url
* @param headers headers * @param headers headers
* @param content full request content * @param content full request content
* @param handler callback after request execute * @param callback callback after request execute
*/ */
public static void asyncHttpPostLarge(String url, List<String> headers, String content, public static void asyncHttpPostLarge(String url, List<String> headers, String content, Callback<String> callback)
AsyncCompletionHandler handler) throws Exception { throws Exception {
asyncHttpPostLarge(url, headers, content.getBytes(), handler); asyncHttpPostLarge(url, headers, content.getBytes(), callback);
} }
/** /**
@ -282,30 +216,15 @@ public class HttpClient {
* @param url url * @param url url
* @param headers headers * @param headers headers
* @param content full request content * @param content full request content
* @param handler callback after request execute * @param callback callback after request execute
*/ */
public static void asyncHttpPostLarge(String url, List<String> headers, byte[] content, public static void asyncHttpPostLarge(String url, List<String> headers, byte[] content, Callback<String> callback)
AsyncCompletionHandler handler) throws Exception { throws Exception {
AsyncHttpClient.BoundRequestBuilder builder = asyncHttpClient.preparePost(url); Header header = Header.newInstance();
if (CollectionUtils.isNotEmpty(headers)) {
if (!CollectionUtils.isEmpty(headers)) { header.addAll(headers);
for (String header : headers) {
builder.setHeader(header.split("=")[0], header.split("=")[1]);
}
}
builder.setBody(content);
builder.setHeader("Content-Type", "application/json; charset=UTF-8");
builder.setHeader("Accept-Charset", "UTF-8");
builder.setHeader("Accept-Encoding", "gzip");
builder.setHeader("Content-Encoding", "gzip");
if (handler != null) {
builder.execute(handler);
} else {
builder.execute();
} }
ASYNC_REST_TEMPLATE.post(url, header, Query.EMPTY, content, String.class, callback);
} }
/** /**
@ -314,33 +233,18 @@ public class HttpClient {
* @param url url * @param url url
* @param headers headers * @param headers headers
* @param content full request content * @param content full request content
* @param handler callback after request execute * @param callback callback after request execute
*/ */
public static void asyncHttpDeleteLarge(String url, List<String> headers, String content, public static void asyncHttpDeleteLarge(String url, List<String> headers, String content, Callback<String> callback)
AsyncCompletionHandler handler) throws Exception { throws Exception {
AsyncHttpClient.BoundRequestBuilder builder = asyncHttpClient.prepareDelete(url); Header header = Header.newInstance();
if (CollectionUtils.isNotEmpty(headers)) {
if (!CollectionUtils.isEmpty(headers)) { header.addAll(headers);
for (String header : headers) {
builder.setHeader(header.split("=")[0], header.split("=")[1]);
} }
ASYNC_REST_TEMPLATE.delete(url, header, content, String.class, callback);
} }
builder.setBody(content.getBytes()); public static RestResult<String> httpPost(String url, List<String> headers, Map<String, String> paramValues) {
builder.setHeader("Content-Type", "application/json; charset=UTF-8");
builder.setHeader("Accept-Charset", "UTF-8");
builder.setHeader("Accept-Encoding", "gzip");
builder.setHeader("Content-Encoding", "gzip");
if (handler != null) {
builder.execute(handler);
} else {
builder.execute();
}
}
public static HttpResult httpPost(String url, List<String> headers, Map<String, String> paramValues) {
return httpPost(url, headers, paramValues, "UTF-8"); return httpPost(url, headers, paramValues, "UTF-8");
} }
@ -351,44 +255,22 @@ public class HttpClient {
* @param headers headers * @param headers headers
* @param paramValues params * @param paramValues params
* @param encoding charset * @param encoding charset
* @return {@link HttpResult} as response * @return {@link RestResult} as response
*/ */
public static HttpResult httpPost(String url, List<String> headers, Map<String, String> paramValues, public static RestResult<String> httpPost(String url, List<String> headers, Map<String, String> paramValues,
String encoding) { String encoding) {
try { try {
Header header = Header.newInstance();
HttpPost httpost = new HttpPost(url); if (CollectionUtils.isNotEmpty(headers)) {
header.addAll(headers);
RequestConfig requestConfig = RequestConfig.custom().setConnectionRequestTimeout(5000)
.setConnectTimeout(5000).setSocketTimeout(5000).setRedirectsEnabled(true).setMaxRedirects(5)
.build();
httpost.setConfig(requestConfig);
List<NameValuePair> nvps = new ArrayList<NameValuePair>();
for (Map.Entry<String, String> entry : paramValues.entrySet()) {
nvps.add(new BasicNameValuePair(entry.getKey(), entry.getValue()));
} }
header.addParam(HttpHeaderConsts.ACCEPT_CHARSET, encoding);
httpost.setEntity(new UrlEncodedFormEntity(nvps, encoding)); HttpClientConfig httpClientConfig = HttpClientConfig.builder().setConTimeOutMillis(5000).setReadTimeOutMillis(5000)
HttpResponse response = postClient.execute(httpost); .setConnectionRequestTimeout(5000).setMaxRedirects(5).build();
HttpEntity entity = response.getEntity(); return APACHE_SYNC_NACOS_REST_TEMPLATE.postForm(url, httpClientConfig, header, paramValues, String.class);
String charset = encoding;
if (entity.getContentType() != null) {
HeaderElement[] headerElements = entity.getContentType().getElements();
if (headerElements != null && headerElements.length > 0 && headerElements[0] != null
&& headerElements[0].getParameterByName("charset") != null) {
charset = headerElements[0].getParameterByName("charset").getValue();
}
}
return new HttpResult(response.getStatusLine().getStatusCode(),
IoUtils.toString(entity.getContent(), charset), Collections.<String, String>emptyMap());
} catch (Throwable e) { } catch (Throwable e) {
return new HttpResult(500, e.toString(), Collections.<String, String>emptyMap()); return RestResult.<String>builder().withCode(500).withMsg(e.toString()).build();
} }
} }
@ -398,62 +280,15 @@ public class HttpClient {
* @param url url * @param url url
* @param headers headers * @param headers headers
* @param content full request content * @param content full request content
* @param handler callback after request execute * @param callback callback after request execute
*/ */
public static void asyncHttpPutLarge(String url, Map<String, String> headers, byte[] content, public static void asyncHttpPutLarge(String url, Map<String, String> headers, byte[] content,
AsyncCompletionHandler handler) throws Exception { Callback<String> callback) throws Exception {
AsyncHttpClient.BoundRequestBuilder builder = asyncHttpClient.preparePut(url); Header header = Header.newInstance();
if (MapUtils.isNotEmpty(headers)) {
if (!headers.isEmpty()) { header.addAll(headers);
for (String headerKey : headers.keySet()) {
builder.setHeader(headerKey, headers.get(headerKey));
}
}
builder.setBody(content);
builder.setHeader("Content-Type", "application/json; charset=UTF-8");
builder.setHeader("Accept-Charset", "UTF-8");
builder.setHeader("Accept-Encoding", "gzip");
builder.setHeader("Content-Encoding", "gzip");
if (handler != null) {
builder.execute(handler);
} else {
builder.execute();
}
}
/**
* Request http get method by async with large body.
*
* @param url url
* @param headers headers
* @param content full request content
* @param handler callback after request execute
*/
public static void asyncHttpGetLarge(String url, Map<String, String> headers, byte[] content,
AsyncCompletionHandler handler) throws Exception {
AsyncHttpClient.BoundRequestBuilder builder = asyncHttpClient.prepareGet(url);
if (!headers.isEmpty()) {
for (String headerKey : headers.keySet()) {
builder.setHeader(headerKey, headers.get(headerKey));
}
}
builder.setBody(content);
builder.setHeader("Content-Type", "application/json; charset=UTF-8");
builder.setHeader("Accept-Charset", "UTF-8");
builder.setHeader("Accept-Encoding", "gzip");
builder.setHeader("Content-Encoding", "gzip");
if (handler != null) {
builder.execute(handler);
} else {
builder.execute();
} }
ASYNC_REST_TEMPLATE.put(url, header, Query.EMPTY, content, String.class, callback);
} }
/** /**
@ -462,29 +297,17 @@ public class HttpClient {
* @param url url * @param url url
* @param headers headers * @param headers headers
* @param content full request content * @param content full request content
* @return {@link HttpResult} as response * @return {@link RestResult} as response
*/ */
public static HttpResult httpPutLarge(String url, Map<String, String> headers, byte[] content) { public static RestResult<String> httpPutLarge(String url, Map<String, String> headers, byte[] content) {
HttpClientBuilder builder = HttpClients.custom().setUserAgent(UtilsAndCommons.SERVER_VERSION) Header header = Header.newInstance();
.setConnectionTimeToLive(500, TimeUnit.MILLISECONDS); if (MapUtils.isNotEmpty(headers)) {
try (CloseableHttpClient httpClient = builder.build();) { header.addAll(headers);
HttpPut httpPut = new HttpPut(url);
for (Map.Entry<String, String> entry : headers.entrySet()) {
httpPut.setHeader(entry.getKey(), entry.getValue());
} }
httpPut.setEntity(new ByteArrayEntity(content, ContentType.APPLICATION_JSON)); try {
return APACHE_SYNC_NACOS_REST_TEMPLATE.put(url, header, Query.EMPTY, content, String.class);
HttpResponse response = httpClient.execute(httpPut);
HttpEntity entity = response.getEntity();
HeaderElement[] headerElements = entity.getContentType().getElements();
String charset = headerElements[0].getParameterByName("charset").getValue();
return new HttpResult(response.getStatusLine().getStatusCode(),
IoUtils.toString(entity.getContent(), charset), Collections.<String, String>emptyMap());
} catch (Exception e) { } catch (Exception e) {
return new HttpResult(500, e.toString(), Collections.<String, String>emptyMap()); return RestResult.<String>builder().withCode(500).withMsg(e.toString()).build();
} }
} }
@ -494,33 +317,17 @@ public class HttpClient {
* @param url url * @param url url
* @param headers headers * @param headers headers
* @param content full request content * @param content full request content
* @return {@link HttpResult} as response * @return {@link RestResult} as response
*/ */
public static HttpResult httpGetLarge(String url, Map<String, String> headers, String content) { public static RestResult<String> httpGetLarge(String url, Map<String, String> headers, String content) {
HttpClientBuilder builder = HttpClients.custom(); Header header = Header.newInstance();
builder.setUserAgent(UtilsAndCommons.SERVER_VERSION); if (MapUtils.isNotEmpty(headers)) {
builder.setConnectionTimeToLive(500, TimeUnit.MILLISECONDS); header.addAll(headers);
try (CloseableHttpClient httpClient = builder.build();) {
HttpGetWithEntity httpGetWithEntity = new HttpGetWithEntity();
httpGetWithEntity.setURI(new URI(url));
for (Map.Entry<String, String> entry : headers.entrySet()) {
httpGetWithEntity.setHeader(entry.getKey(), entry.getValue());
} }
try {
httpGetWithEntity.setEntity(new StringEntity(content, ContentType.create("application/json", "UTF-8"))); return APACHE_SYNC_NACOS_REST_TEMPLATE.getLarge(url, header, Query.EMPTY, content, String.class);
HttpResponse response = httpClient.execute(httpGetWithEntity);
HttpEntity entity = response.getEntity();
HeaderElement[] headerElements = entity.getContentType().getElements();
String charset = headerElements[0].getParameterByName("charset").getValue();
return new HttpResult(response.getStatusLine().getStatusCode(),
IoUtils.toString(entity.getContent(), charset), Collections.<String, String>emptyMap());
} catch (Exception e) { } catch (Exception e) {
return new HttpResult(500, e.toString(), Collections.<String, String>emptyMap()); return RestResult.<String>builder().withCode(500).withMsg(e.toString()).build();
} }
} }
@ -530,126 +337,20 @@ public class HttpClient {
* @param url url * @param url url
* @param headers headers * @param headers headers
* @param content full request content * @param content full request content
* @return {@link HttpResult} as response * @return {@link RestResult} as response
*/ */
public static HttpResult httpPostLarge(String url, Map<String, String> headers, String content) { public static RestResult<String> httpPostLarge(String url, Map<String, String> headers, String content) {
HttpClientBuilder builder = HttpClients.custom(); Header header = Header.newInstance();
builder.setUserAgent(UtilsAndCommons.SERVER_VERSION); if (MapUtils.isNotEmpty(headers)) {
builder.setConnectionTimeToLive(500, TimeUnit.MILLISECONDS); header.addAll(headers);
try (CloseableHttpClient httpClient = builder.build();) {
HttpPost httpost = new HttpPost(url);
for (Map.Entry<String, String> entry : headers.entrySet()) {
httpost.setHeader(entry.getKey(), entry.getValue());
} }
try {
httpost.setEntity(new StringEntity(content, ContentType.create("application/json", "UTF-8"))); return APACHE_SYNC_NACOS_REST_TEMPLATE.postJson(url, header, content, String.class);
HttpResponse response = httpClient.execute(httpost);
HttpEntity entity = response.getEntity();
HeaderElement[] headerElements = entity.getContentType().getElements();
String charset = headerElements[0].getParameterByName("charset").getValue();
return new HttpResult(response.getStatusLine().getStatusCode(),
IoUtils.toString(entity.getContent(), charset), Collections.<String, String>emptyMap());
} catch (Exception e) { } catch (Exception e) {
return new HttpResult(500, e.toString(), Collections.<String, String>emptyMap()); return RestResult.<String>builder().withCode(500).withMsg(e.toString()).build();
} }
} }
private static HttpResult getResult(HttpURLConnection conn) throws IOException {
int respCode = conn.getResponseCode();
InputStream inputStream;
if (HttpURLConnection.HTTP_OK == respCode) {
inputStream = conn.getInputStream();
} else {
inputStream = conn.getErrorStream();
}
Map<String, String> respHeaders = new HashMap<String, String>(conn.getHeaderFields().size());
for (Map.Entry<String, List<String>> entry : conn.getHeaderFields().entrySet()) {
respHeaders.put(entry.getKey(), entry.getValue().get(0));
}
String gzipEncoding = "gzip";
if (gzipEncoding.equals(respHeaders.get(HttpHeaders.CONTENT_ENCODING))) {
inputStream = new GZIPInputStream(inputStream);
}
return new HttpResult(respCode, IoUtils.toString(inputStream, getCharset(conn)), respHeaders);
}
private static String getCharset(HttpURLConnection conn) {
String contentType = conn.getContentType();
if (StringUtils.isEmpty(contentType)) {
return "UTF-8";
}
String[] values = contentType.split(";");
if (values.length == 0) {
return "UTF-8";
}
String charset = "UTF-8";
for (String value : values) {
value = value.trim();
if (value.toLowerCase().startsWith("charset=")) {
charset = value.substring("charset=".length());
}
}
return charset;
}
private static void setHeaders(HttpURLConnection conn, List<String> headers, String encoding) {
if (null != headers) {
for (Iterator<String> iter = headers.iterator(); iter.hasNext(); ) {
conn.addRequestProperty(iter.next(), iter.next());
}
}
conn.addRequestProperty("Content-Type", "application/x-www-form-urlencoded;charset=" + encoding);
conn.addRequestProperty("Accept-Charset", encoding);
conn.addRequestProperty(HttpHeaderConsts.CLIENT_VERSION_HEADER, VersionUtils.version);
conn.addRequestProperty(HttpHeaderConsts.USER_AGENT_HEADER, UtilsAndCommons.SERVER_VERSION);
conn.addRequestProperty(HttpHeaderConsts.REQUEST_SOURCE_HEADER, ApplicationUtils.getLocalAddress());
}
/**
* Encoding parameters.
*
* @param params parameters
* @param encoding charset
* @return parameters string
* @throws UnsupportedEncodingException unsupported encodin exception
*/
public static String encodingParams(Map<String, String> params, String encoding)
throws UnsupportedEncodingException {
StringBuilder sb = new StringBuilder();
if (null == params || params.isEmpty()) {
return null;
}
params.put("encoding", encoding);
params.put("nofix", "1");
for (Map.Entry<String, String> entry : params.entrySet()) {
if (StringUtils.isEmpty(entry.getValue())) {
continue;
}
sb.append(entry.getKey()).append("=");
sb.append(URLEncoder.encode(entry.getValue(), encoding));
sb.append("&");
}
return sb.toString();
}
/** /**
* Translate parameter map. * Translate parameter map.
* *
@ -664,33 +365,4 @@ public class HttpClient {
} }
return map; return map;
} }
public static class HttpResult {
public final int code;
public final String content;
private final Map<String, String> respHeaders;
public HttpResult(int code, String content, Map<String, String> respHeaders) {
this.code = code;
this.content = content;
this.respHeaders = respHeaders;
}
public String getHeader(String name) {
return respHeaders.get(name);
}
}
public static class HttpGetWithEntity extends HttpEntityEnclosingRequestBase {
public static final String METHOD_NAME = "GET";
@Override
public String getMethod() {
return METHOD_NAME;
}
}
} }

149
naming/src/main/java/com/alibaba/nacos/naming/misc/HttpClientManager.java Normal file
View File

@ -0,0 +1,149 @@
/*
* Copyright 1999-2018 Alibaba Group Holding Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.alibaba.nacos.naming.misc;
import com.alibaba.nacos.common.http.AbstractApacheHttpClientFactory;
import com.alibaba.nacos.common.http.AbstractHttpClientFactory;
import com.alibaba.nacos.common.http.HttpClientBeanHolder;
import com.alibaba.nacos.common.http.HttpClientConfig;
import com.alibaba.nacos.common.http.HttpClientFactory;
import com.alibaba.nacos.common.http.client.NacosAsyncRestTemplate;
import com.alibaba.nacos.common.http.client.NacosRestTemplate;
import com.alibaba.nacos.common.utils.ExceptionUtil;
import com.alibaba.nacos.common.utils.ThreadUtils;
import org.slf4j.Logger;
import java.util.concurrent.TimeUnit;
import static com.alibaba.nacos.naming.misc.Loggers.SRV_LOG;
/**
* http Manager.
*
* @author mai.jh
*/
public class HttpClientManager {
private static final int TIME_OUT_MILLIS = 10000;
private static final int CON_TIME_OUT_MILLIS = 5000;
private static final HttpClientFactory SYNC_HTTP_CLIENT_FACTORY = new SyncHttpClientFactory();
private static final HttpClientFactory ASYNC_HTTP_CLIENT_FACTORY = new AsyncHttpClientFactory();
private static final HttpClientFactory APACHE_SYNC_HTTP_CLIENT_FACTORY = new ApacheSyncHttpClientFactory();
private static final NacosRestTemplate NACOS_REST_TEMPLATE;
private static final NacosRestTemplate APACHE_NACOS_REST_TEMPLATE;
private static final NacosAsyncRestTemplate NACOS_ASYNC_REST_TEMPLATE;
static {
// build nacos rest template
NACOS_REST_TEMPLATE = HttpClientBeanHolder.getNacosRestTemplate(SYNC_HTTP_CLIENT_FACTORY);
APACHE_NACOS_REST_TEMPLATE = HttpClientBeanHolder.getNacosRestTemplate(APACHE_SYNC_HTTP_CLIENT_FACTORY);
NACOS_ASYNC_REST_TEMPLATE = HttpClientBeanHolder.getNacosAsyncRestTemplate(ASYNC_HTTP_CLIENT_FACTORY);
ThreadUtils.addShutdownHook(new Runnable() {
@Override
public void run() {
shutdown();
}
});
}
public static NacosRestTemplate getNacosRestTemplate() {
return NACOS_REST_TEMPLATE;
}
/**
* Use apache http client to achieve.
* @return NacosRestTemplate
*/
public static NacosRestTemplate getApacheRestTemplate() {
return APACHE_NACOS_REST_TEMPLATE;
}
public static NacosAsyncRestTemplate getAsyncRestTemplate() {
return NACOS_ASYNC_REST_TEMPLATE;
}
private static void shutdown() {
SRV_LOG.warn("[NamingServerHttpClientManager] Start destroying HTTP-Client");
try {
HttpClientBeanHolder.shutdownNacostSyncRest(SYNC_HTTP_CLIENT_FACTORY.getClass().getName());
HttpClientBeanHolder.shutdownNacostSyncRest(APACHE_SYNC_HTTP_CLIENT_FACTORY.getClass().getName());
HttpClientBeanHolder.shutdownNacosAsyncRest(ASYNC_HTTP_CLIENT_FACTORY.getClass().getName());
} catch (Exception ex) {
SRV_LOG.error("[NamingServerHttpClientManager] An exception occurred when the HTTP client was closed : {}",
ExceptionUtil.getStackTrace(ex));
}
SRV_LOG.warn("[NamingServerHttpClientManager] Destruction of the end");
}
private static class AsyncHttpClientFactory extends AbstractHttpClientFactory {
@Override
protected HttpClientConfig buildHttpClientConfig() {
return HttpClientConfig.builder().setConTimeOutMillis(CON_TIME_OUT_MILLIS)
.setReadTimeOutMillis(TIME_OUT_MILLIS)
.setUserAgent(UtilsAndCommons.SERVER_VERSION)
.setMaxConnTotal(-1)
.setMaxConnPerRoute(128)
.setMaxRedirects(0).build();
}
@Override
protected Logger assignLogger() {
return SRV_LOG;
}
}
private static class SyncHttpClientFactory extends AbstractHttpClientFactory {
@Override
protected HttpClientConfig buildHttpClientConfig() {
return HttpClientConfig.builder().setConTimeOutMillis(CON_TIME_OUT_MILLIS)
.setReadTimeOutMillis(TIME_OUT_MILLIS)
.setMaxRedirects(0).build();
}
@Override
protected Logger assignLogger() {
return SRV_LOG;
}
}
private static class ApacheSyncHttpClientFactory extends AbstractApacheHttpClientFactory {
@Override
protected HttpClientConfig buildHttpClientConfig() {
return HttpClientConfig.builder()
.setConnectionTimeToLive(500, TimeUnit.MILLISECONDS)
.setMaxConnTotal(Runtime.getRuntime().availableProcessors() * 2)
.setMaxConnPerRoute(Runtime.getRuntime().availableProcessors())
.setMaxRedirects(0).build();
}
@Override
protected Logger assignLogger() {
return SRV_LOG;
}
}
}

96
naming/src/main/java/com/alibaba/nacos/naming/misc/NamingProxy.java
View File

@ -17,11 +17,11 @@
package com.alibaba.nacos.naming.misc; package com.alibaba.nacos.naming.misc;
import com.alibaba.nacos.common.constant.HttpHeaderConsts; import com.alibaba.nacos.common.constant.HttpHeaderConsts;
import com.alibaba.nacos.common.http.Callback;
import com.alibaba.nacos.common.model.RestResult;
import com.alibaba.nacos.common.utils.JacksonUtils; import com.alibaba.nacos.common.utils.JacksonUtils;
import com.alibaba.nacos.common.utils.VersionUtils; import com.alibaba.nacos.common.utils.VersionUtils;
import com.alibaba.nacos.core.utils.ApplicationUtils; import com.alibaba.nacos.core.utils.ApplicationUtils;
import com.ning.http.client.AsyncCompletionHandler;
import com.ning.http.client.Response;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import java.io.IOException; import java.io.IOException;
@ -69,28 +69,32 @@ public class NamingProxy {
headers.put(HttpHeaderConsts.CLIENT_VERSION_HEADER, VersionUtils.version); headers.put(HttpHeaderConsts.CLIENT_VERSION_HEADER, VersionUtils.version);
headers.put(HttpHeaderConsts.USER_AGENT_HEADER, UtilsAndCommons.SERVER_VERSION); headers.put(HttpHeaderConsts.USER_AGENT_HEADER, UtilsAndCommons.SERVER_VERSION);
headers.put("Connection", "Keep-Alive"); headers.put(HttpHeaderConsts.CONNECTION, "Keep-Alive");
HttpClient.asyncHttpPutLarge( HttpClient.asyncHttpPutLarge(
"http://" + server + ApplicationUtils.getContextPath() + UtilsAndCommons.NACOS_NAMING_CONTEXT "http://" + server + ApplicationUtils.getContextPath() + UtilsAndCommons.NACOS_NAMING_CONTEXT
+ TIMESTAMP_SYNC_URL + "?source=" + NetUtils.localServer(), headers, checksums, + TIMESTAMP_SYNC_URL + "?source=" + NetUtils.localServer(), headers, checksums,
new AsyncCompletionHandler() { new Callback<String>() {
@Override @Override
public Object onCompleted(Response response) throws Exception { public void onReceive(RestResult<String> result) {
if (HttpURLConnection.HTTP_OK != response.getStatusCode()) { if (!result.ok()) {
Loggers.DISTRO.error("failed to req API: {}, code: {}, msg: {}", Loggers.DISTRO.error("failed to req API: {}, code: {}, msg: {}",
"http://" + server + ApplicationUtils.getContextPath() "http://" + server + ApplicationUtils.getContextPath()
+ UtilsAndCommons.NACOS_NAMING_CONTEXT + TIMESTAMP_SYNC_URL, + UtilsAndCommons.NACOS_NAMING_CONTEXT + TIMESTAMP_SYNC_URL,
response.getStatusCode(), response.getResponseBody()); result.getCode(), result.getMessage());
} }
return null;
} }
@Override @Override
public void onThrowable(Throwable t) { public void onError(Throwable throwable) {
Loggers.DISTRO Loggers.DISTRO
.error("failed to req API:" + "http://" + server + ApplicationUtils.getContextPath() .error("failed to req API:" + "http://" + server + ApplicationUtils.getContextPath()
+ UtilsAndCommons.NACOS_NAMING_CONTEXT + TIMESTAMP_SYNC_URL, t); + UtilsAndCommons.NACOS_NAMING_CONTEXT + TIMESTAMP_SYNC_URL, throwable);
}
@Override
public void onCancel() {
} }
}); });
} catch (Exception e) { } catch (Exception e) {
@ -110,17 +114,17 @@ public class NamingProxy {
Map<String, String> params = new HashMap<>(8); Map<String, String> params = new HashMap<>(8);
params.put("keys", StringUtils.join(keys, ",")); params.put("keys", StringUtils.join(keys, ","));
HttpClient.HttpResult result = HttpClient.httpGetLarge( RestResult<String> result = HttpClient.httpGetLarge(
"http://" + server + ApplicationUtils.getContextPath() + UtilsAndCommons.NACOS_NAMING_CONTEXT "http://" + server + ApplicationUtils.getContextPath() + UtilsAndCommons.NACOS_NAMING_CONTEXT
+ DATA_GET_URL, new HashMap<>(8), JacksonUtils.toJson(params)); + DATA_GET_URL, new HashMap<>(8), JacksonUtils.toJson(params));
if (HttpURLConnection.HTTP_OK == result.code) { if (result.ok()) {
return result.content.getBytes(); return result.getData().getBytes();
} }
throw new IOException("failed to req API: " + "http://" + server + ApplicationUtils.getContextPath() throw new IOException("failed to req API: " + "http://" + server + ApplicationUtils.getContextPath()
+ UtilsAndCommons.NACOS_NAMING_CONTEXT + DATA_GET_URL + ". code: " + result.code + " msg: " + UtilsAndCommons.NACOS_NAMING_CONTEXT + DATA_GET_URL + ". code: " + result.getCode() + " msg: "
+ result.content); + result.getMessage());
} }
/** /**
@ -133,17 +137,17 @@ public class NamingProxy {
public static byte[] getAllData(String server) throws Exception { public static byte[] getAllData(String server) throws Exception {
Map<String, String> params = new HashMap<>(8); Map<String, String> params = new HashMap<>(8);
HttpClient.HttpResult result = HttpClient.httpGet( RestResult<String> result = HttpClient.httpGet(
"http://" + server + ApplicationUtils.getContextPath() + UtilsAndCommons.NACOS_NAMING_CONTEXT "http://" + server + ApplicationUtils.getContextPath() + UtilsAndCommons.NACOS_NAMING_CONTEXT
+ ALL_DATA_GET_URL, new ArrayList<>(), params); + ALL_DATA_GET_URL, new ArrayList<>(), params);
if (HttpURLConnection.HTTP_OK == result.code) { if (result.ok()) {
return result.content.getBytes(); return result.getData().getBytes();
} }
throw new IOException("failed to req API: " + "http://" + server + ApplicationUtils.getContextPath() throw new IOException("failed to req API: " + "http://" + server + ApplicationUtils.getContextPath()
+ UtilsAndCommons.NACOS_NAMING_CONTEXT + DATA_GET_URL + ". code: " + result.code + " msg: " + UtilsAndCommons.NACOS_NAMING_CONTEXT + DATA_GET_URL + ". code: " + result.getCode() + " msg: "
+ result.content); + result.getMessage());
} }
/** /**
@ -158,23 +162,23 @@ public class NamingProxy {
headers.put(HttpHeaderConsts.CLIENT_VERSION_HEADER, VersionUtils.version); headers.put(HttpHeaderConsts.CLIENT_VERSION_HEADER, VersionUtils.version);
headers.put(HttpHeaderConsts.USER_AGENT_HEADER, UtilsAndCommons.SERVER_VERSION); headers.put(HttpHeaderConsts.USER_AGENT_HEADER, UtilsAndCommons.SERVER_VERSION);
headers.put("Accept-Encoding", "gzip,deflate,sdch"); headers.put(HttpHeaderConsts.ACCEPT_ENCODING, "gzip,deflate,sdch");
headers.put("Connection", "Keep-Alive"); headers.put(HttpHeaderConsts.CONNECTION, "Keep-Alive");
headers.put("Content-Encoding", "gzip"); headers.put(HttpHeaderConsts.CONTENT_ENCODING, "gzip");
try { try {
HttpClient.HttpResult result = HttpClient.httpPutLarge( RestResult<String> result = HttpClient.httpPutLarge(
"http://" + curServer + ApplicationUtils.getContextPath() + UtilsAndCommons.NACOS_NAMING_CONTEXT "http://" + curServer + ApplicationUtils.getContextPath() + UtilsAndCommons.NACOS_NAMING_CONTEXT
+ DATA_ON_SYNC_URL, headers, data); + DATA_ON_SYNC_URL, headers, data);
if (HttpURLConnection.HTTP_OK == result.code) { if (result.ok()) {
return true; return true;
} }
if (HttpURLConnection.HTTP_NOT_MODIFIED == result.code) { if (HttpURLConnection.HTTP_NOT_MODIFIED == result.getCode()) {
return true; return true;
} }
throw new IOException("failed to req API:" + "http://" + curServer + ApplicationUtils.getContextPath() throw new IOException("failed to req API:" + "http://" + curServer + ApplicationUtils.getContextPath()
+ UtilsAndCommons.NACOS_NAMING_CONTEXT + DATA_ON_SYNC_URL + ". code:" + result.code + " msg: " + UtilsAndCommons.NACOS_NAMING_CONTEXT + DATA_ON_SYNC_URL + ". code:" + result.getCode() + " msg: "
+ result.content); + result.getData());
} catch (Exception e) { } catch (Exception e) {
Loggers.SRV_LOG.warn("NamingProxy", e); Loggers.SRV_LOG.warn("NamingProxy", e);
} }
@ -196,7 +200,7 @@ public class NamingProxy {
HttpHeaderConsts.USER_AGENT_HEADER, UtilsAndCommons.SERVER_VERSION, "Accept-Encoding", HttpHeaderConsts.USER_AGENT_HEADER, UtilsAndCommons.SERVER_VERSION, "Accept-Encoding",
"gzip,deflate,sdch", "Connection", "Keep-Alive", "Content-Encoding", "gzip"); "gzip,deflate,sdch", "Connection", "Keep-Alive", "Content-Encoding", "gzip");
HttpClient.HttpResult result; RestResult<String> result;
if (!curServer.contains(UtilsAndCommons.IP_PORT_SPLITER)) { if (!curServer.contains(UtilsAndCommons.IP_PORT_SPLITER)) {
curServer = curServer + UtilsAndCommons.IP_PORT_SPLITER + ApplicationUtils.getPort(); curServer = curServer + UtilsAndCommons.IP_PORT_SPLITER + ApplicationUtils.getPort();
@ -204,17 +208,17 @@ public class NamingProxy {
result = HttpClient.httpGet("http://" + curServer + api, headers, params); result = HttpClient.httpGet("http://" + curServer + api, headers, params);
if (HttpURLConnection.HTTP_OK == result.code) { if (result.ok()) {
return result.content; return result.getData();
} }
if (HttpURLConnection.HTTP_NOT_MODIFIED == result.code) { if (HttpURLConnection.HTTP_NOT_MODIFIED == result.getCode()) {
return StringUtils.EMPTY; return StringUtils.EMPTY;
} }
throw new IOException( throw new IOException(
"failed to req API:" + "http://" + curServer + api + ". code:" + result.code + " msg: " "failed to req API:" + "http://" + curServer + api + ". code:" + result.getCode() + " msg: "
+ result.content); + result.getMessage());
} catch (Exception e) { } catch (Exception e) {
Loggers.SRV_LOG.warn("NamingProxy", e); Loggers.SRV_LOG.warn("NamingProxy", e);
} }
@ -238,7 +242,7 @@ public class NamingProxy {
HttpHeaderConsts.USER_AGENT_HEADER, UtilsAndCommons.SERVER_VERSION, "Accept-Encoding", HttpHeaderConsts.USER_AGENT_HEADER, UtilsAndCommons.SERVER_VERSION, "Accept-Encoding",
"gzip,deflate,sdch", "Connection", "Keep-Alive", "Content-Encoding", "gzip"); "gzip,deflate,sdch", "Connection", "Keep-Alive", "Content-Encoding", "gzip");
HttpClient.HttpResult result; RestResult<String> result;
if (!curServer.contains(UtilsAndCommons.IP_PORT_SPLITER)) { if (!curServer.contains(UtilsAndCommons.IP_PORT_SPLITER)) {
curServer = curServer + UtilsAndCommons.IP_PORT_SPLITER + ApplicationUtils.getPort(); curServer = curServer + UtilsAndCommons.IP_PORT_SPLITER + ApplicationUtils.getPort();
@ -254,17 +258,17 @@ public class NamingProxy {
+ "/api/" + api, headers, params); + "/api/" + api, headers, params);
} }
if (HttpURLConnection.HTTP_OK == result.code) { if (result.ok()) {
return result.content; return result.getData();
} }
if (HttpURLConnection.HTTP_NOT_MODIFIED == result.code) { if (HttpURLConnection.HTTP_NOT_MODIFIED == result.getCode()) {
return StringUtils.EMPTY; return StringUtils.EMPTY;
} }
throw new IOException("failed to req API:" + "http://" + curServer + ApplicationUtils.getContextPath() throw new IOException("failed to req API:" + "http://" + curServer + ApplicationUtils.getContextPath()
+ UtilsAndCommons.NACOS_NAMING_CONTEXT + "/api/" + api + ". code:" + result.code + " msg: " + UtilsAndCommons.NACOS_NAMING_CONTEXT + "/api/" + api + ". code:" + result.getCode() + " msg: "
+ result.content); + result.getMessage());
} catch (Exception e) { } catch (Exception e) {
Loggers.SRV_LOG.warn("NamingProxy", e); Loggers.SRV_LOG.warn("NamingProxy", e);
} }
@ -288,7 +292,7 @@ public class NamingProxy {
UtilsAndCommons.SERVER_VERSION, "Accept-Encoding", "gzip,deflate,sdch", "Connection", "Keep-Alive", UtilsAndCommons.SERVER_VERSION, "Accept-Encoding", "gzip,deflate,sdch", "Connection", "Keep-Alive",
"Content-Encoding", "gzip"); "Content-Encoding", "gzip");
HttpClient.HttpResult result; RestResult<String> result;
if (!curServer.contains(UtilsAndCommons.IP_PORT_SPLITER)) { if (!curServer.contains(UtilsAndCommons.IP_PORT_SPLITER)) {
curServer = curServer + UtilsAndCommons.IP_PORT_SPLITER + ApplicationUtils.getPort(); curServer = curServer + UtilsAndCommons.IP_PORT_SPLITER + ApplicationUtils.getPort();
@ -304,17 +308,17 @@ public class NamingProxy {
+ path, headers, params); + path, headers, params);
} }
if (HttpURLConnection.HTTP_OK == result.code) { if (result.ok()) {
return result.content; return result.getData();
} }
if (HttpURLConnection.HTTP_NOT_MODIFIED == result.code) { if (HttpURLConnection.HTTP_NOT_MODIFIED == result.getCode()) {
return StringUtils.EMPTY; return StringUtils.EMPTY;
} }
throw new IOException("failed to req API:" + "http://" + curServer + ApplicationUtils.getContextPath() throw new IOException("failed to req API:" + "http://" + curServer + ApplicationUtils.getContextPath()
+ UtilsAndCommons.NACOS_NAMING_CONTEXT + path + ". code:" + result.code + " msg: " + UtilsAndCommons.NACOS_NAMING_CONTEXT + path + ". code:" + result.getCode() + " msg: "
+ result.content); + result.getMessage());
} catch (Exception e) { } catch (Exception e) {
Loggers.SRV_LOG.warn("NamingProxy", e); Loggers.SRV_LOG.warn("NamingProxy", e);
} }

23
naming/src/main/java/com/alibaba/nacos/naming/misc/ServerStatusSynchronizer.java
View File

@ -16,12 +16,11 @@
package com.alibaba.nacos.naming.misc; package com.alibaba.nacos.naming.misc;
import com.alibaba.nacos.common.http.Callback;
import com.alibaba.nacos.common.model.RestResult;
import com.alibaba.nacos.core.utils.ApplicationUtils; import com.alibaba.nacos.core.utils.ApplicationUtils;
import com.ning.http.client.AsyncCompletionHandler;
import com.ning.http.client.Response;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import java.net.HttpURLConnection;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -52,15 +51,23 @@ public class ServerStatusSynchronizer implements Synchronizer {
} }
try { try {
HttpClient.asyncHttpGet(url, null, params, new AsyncCompletionHandler() { HttpClient.asyncHttpGet(url, null, params, new Callback<String>() {
@Override @Override
public Integer onCompleted(Response response) throws Exception { public void onReceive(RestResult<String> result) {
if (response.getStatusCode() != HttpURLConnection.HTTP_OK) { if (!result.ok()) {
Loggers.SRV_LOG.warn("[STATUS-SYNCHRONIZE] failed to request serverStatus, remote server: {}", Loggers.SRV_LOG.warn("[STATUS-SYNCHRONIZE] failed to request serverStatus, remote server: {}",
serverIP); serverIP);
return 1;
} }
return 0; }
@Override
public void onError(Throwable throwable) {
Loggers.SRV_LOG.warn("[STATUS-SYNCHRONIZE] failed to request serverStatus, remote server: {}", serverIP, throwable);
}
@Override
public void onCancel() {
} }
}); });
} catch (Exception e) { } catch (Exception e) {

23
naming/src/main/java/com/alibaba/nacos/naming/misc/ServiceStatusSynchronizer.java
View File

@ -16,13 +16,12 @@
package com.alibaba.nacos.naming.misc; package com.alibaba.nacos.naming.misc;
import com.alibaba.nacos.common.http.Callback;
import com.alibaba.nacos.common.model.RestResult;
import com.alibaba.nacos.common.utils.JacksonUtils; import com.alibaba.nacos.common.utils.JacksonUtils;
import com.alibaba.nacos.core.utils.ApplicationUtils; import com.alibaba.nacos.core.utils.ApplicationUtils;
import com.ning.http.client.AsyncCompletionHandler;
import com.ning.http.client.Response;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import java.net.HttpURLConnection;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -53,16 +52,24 @@ public class ServiceStatusSynchronizer implements Synchronizer {
} }
try { try {
HttpClient.asyncHttpPostLarge(url, null, JacksonUtils.toJson(params), new AsyncCompletionHandler() { HttpClient.asyncHttpPostLarge(url, null, JacksonUtils.toJson(params), new Callback<String>() {
@Override @Override
public Integer onCompleted(Response response) throws Exception { public void onReceive(RestResult<String> result) {
if (response.getStatusCode() != HttpURLConnection.HTTP_OK) { if (!result.ok()) {
Loggers.SRV_LOG.warn("[STATUS-SYNCHRONIZE] failed to request serviceStatus, remote server: {}", Loggers.SRV_LOG.warn("[STATUS-SYNCHRONIZE] failed to request serviceStatus, remote server: {}",
serverIP); serverIP);
return 1;
} }
return 0; }
@Override
public void onError(Throwable throwable) {
Loggers.SRV_LOG.warn("[STATUS-SYNCHRONIZE] failed to request serviceStatus, remote server: " + serverIP, throwable);
}
@Override
public void onCancel() {
} }
}); });
} catch (Exception e) { } catch (Exception e) {

6
naming/src/main/java/com/alibaba/nacos/naming/web/DistroFilter.java
View File

@ -19,6 +19,7 @@ package com.alibaba.nacos.naming.web;
import com.alibaba.nacos.api.common.Constants; import com.alibaba.nacos.api.common.Constants;
import com.alibaba.nacos.api.naming.CommonParams; import com.alibaba.nacos.api.naming.CommonParams;
import com.alibaba.nacos.common.constant.HttpHeaderConsts; import com.alibaba.nacos.common.constant.HttpHeaderConsts;
import com.alibaba.nacos.common.model.RestResult;
import com.alibaba.nacos.common.utils.ExceptionUtil; import com.alibaba.nacos.common.utils.ExceptionUtil;
import com.alibaba.nacos.common.utils.IoUtils; import com.alibaba.nacos.common.utils.IoUtils;
import com.alibaba.nacos.core.code.ControllerMethodsCache; import com.alibaba.nacos.core.code.ControllerMethodsCache;
@ -139,11 +140,12 @@ public class DistroFilter implements Filter {
final String body = IoUtils.toString(req.getInputStream(), Charsets.UTF_8.name()); final String body = IoUtils.toString(req.getInputStream(), Charsets.UTF_8.name());
final Map<String, String> paramsValue = HttpClient.translateParameterMap(req.getParameterMap()); final Map<String, String> paramsValue = HttpClient.translateParameterMap(req.getParameterMap());
HttpClient.HttpResult result = HttpClient RestResult<String> result = HttpClient
.request("http://" + targetServer + req.getRequestURI(), headerList, paramsValue, body, .request("http://" + targetServer + req.getRequestURI(), headerList, paramsValue, body,
PROXY_CONNECT_TIMEOUT, PROXY_READ_TIMEOUT, Charsets.UTF_8.name(), req.getMethod()); PROXY_CONNECT_TIMEOUT, PROXY_READ_TIMEOUT, Charsets.UTF_8.name(), req.getMethod());
String data = result.ok() ? result.getData() : result.getMessage();
try { try {
WebUtils.response(resp, result.content, result.code); WebUtils.response(resp, data, result.getCode());
} catch (Exception ignore) { } catch (Exception ignore) {
Loggers.SRV_LOG.warn("[DISTRO-FILTER] request failed: " + distroMapper.mapSrv(groupedServiceName) Loggers.SRV_LOG.warn("[DISTRO-FILTER] request failed: " + distroMapper.mapSrv(groupedServiceName)
+ urlString); + urlString);