fix:fix consul heartbeat read timeout. (#640)

Author: SkyeBeFreeman

polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/ecwid/consul/transport/TtlHttpTransport.java

@@ -0,0 +1,67 @@
+/*
+ * Tencent is pleased to support the open source community by making polaris-java available.
+ *
+ * Copyright (C) 2021 Tencent. All rights reserved.
+ *
+ * Licensed under the BSD 3-Clause License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ *
+ * 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.ecwid.consul.transport;
+
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+
+/**
+ * Transport for TTL.
+ *
+ * @author Haotian Zhang
+ */
+public class TtlHttpTransport extends AbstractHttpTransport {
+
+    private final HttpClient httpClient;
+
+    static final int DEFAULT_TTL_READ_TIMEOUT = 5 * 1000; // 5s
+    static final int DEFAULT_CONNECTION_TIMEOUT = 5 * 1000; // 5s
+
+    public TtlHttpTransport() {
+        this(DEFAULT_TTL_READ_TIMEOUT);
+    }
+
+    public TtlHttpTransport(int ttlReadTimeout) {
+        if (ttlReadTimeout == 0) {
+            ttlReadTimeout = DEFAULT_TTL_READ_TIMEOUT;
+        }
+        PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager();
+        connectionManager.setMaxTotal(DEFAULT_MAX_CONNECTIONS);
+        connectionManager.setDefaultMaxPerRoute(DEFAULT_MAX_PER_ROUTE_CONNECTIONS);
+
+        RequestConfig requestConfig = RequestConfig.custom().
+                setConnectTimeout(DEFAULT_CONNECTION_TIMEOUT).
+                setConnectionRequestTimeout(DEFAULT_CONNECTION_TIMEOUT).
+                setSocketTimeout(ttlReadTimeout).
+                build();
+
+        HttpClientBuilder httpClientBuilder = HttpClientBuilder.create().
+                setConnectionManager(connectionManager).
+                setDefaultRequestConfig(requestConfig).
+                useSystemProperties();
+
+        this.httpClient = httpClientBuilder.build();
+    }
+
+    @Override
+    public HttpClient getHttpClient() {
+        return httpClient;
+    }
+}

polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/ConsulAPIConnector.java

@@ -21,6 +21,7 @@
 import com.ecwid.consul.SingleUrlParameters;
 import com.ecwid.consul.UrlParameters;
 import com.ecwid.consul.transport.HttpResponse;
+import com.ecwid.consul.transport.TtlHttpTransport;
 import com.ecwid.consul.v1.ConsulClient;
 import com.ecwid.consul.v1.ConsulRawClient;
 import com.ecwid.consul.v1.OperationException;
@@ -98,6 +99,10 @@ public class ConsulAPIConnector extends DestroyableServerConnector {
 
     private ConsulRawClient consulRawClient;
 
+    private ConsulClient ttlConsulClient;
+
+    private ConsulRawClient ttlConsulRawClient;
+
     private ConsulContext consulContext;
 
     private ObjectMapper mapper;
@@ -185,6 +190,8 @@ private void initActually(InitContext ctx, ServerConnectorConfig connectorConfig
         LOG.debug("Consul Server : [{}]", address);
         consulRawClient = new ConsulRawClient(agentHost, agentPort);
         consulClient = new ConsulClient(consulRawClient);
+        ttlConsulRawClient = new ConsulRawClient(agentHost, agentPort, new TtlHttpTransport().getHttpClient());
+        ttlConsulClient = new ConsulClient(ttlConsulRawClient);
 
         // Init context.
         consulContext = new ConsulContext();
@@ -412,7 +419,7 @@ public void heartbeat(CommonProviderRequest req) throws PolarisException {
         if (ieRegistered) {
             ServiceKey serviceKey = new ServiceKey(req.getNamespace(), req.getService());
             try {
-                this.consulClient.agentCheckPass(consulContext.getCheckId(), null, consulContext.getAclToken());
+                this.ttlConsulClient.agentCheckPass(consulContext.getCheckId(), null, consulContext.getAclToken());
                 if (LOG.isDebugEnabled()) {
                     LOG.debug("Heartbeat service to Consul: " + consulContext.getCheckId());
                 }