fix sync service pending on start since load agent list from cc

Author: Yang Guo

platform-api/src/main/java/com/flow/platform/api/service/SyncServiceImpl.java

@@ -49,6 +49,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
 
 /**
@@ -76,6 +77,9 @@ public class SyncServiceImpl implements SyncService {
     @Autowired
     private AgentService agentService;
 
+    @Autowired
+    private ThreadPoolTaskExecutor taskExecutor;
+
     @Value("${domain.api}")
     private String apiDomain;
 
@@ -85,14 +89,18 @@ public class SyncServiceImpl implements SyncService {
     private void init() {
         callbackUrl = HttpURL.build(apiDomain).append("/hooks/sync").toString();
 
-        try {
-            List<Agent> agents = agentService.list();
-            for (Agent agent : agents) {
-                register(agent.getPath());
+        taskExecutor.execute(() -> {
+            try {
+                LOGGER.trace("Start to init agent list in thread: " + Thread.currentThread().getName());
+
+                List<Agent> agents = agentService.list();
+                for (Agent agent : agents) {
+                    register(agent.getPath());
+                }
+            } catch (Throwable e) {
+                LOGGER.warn(e.getMessage());
             }
-        } catch (Throwable e) {
-            LOGGER.warn("Cannot load agent list " + e.getMessage());
-        }
+        });
     }
 
     @Override

platform-util-http/src/main/java/com/flow/platform/util/http/HttpClient.java

@@ -18,6 +18,7 @@
 
 import static com.flow.platform.util.http.HttpResponse.EXCEPTION_STATUS_CODE;
 
+import com.flow.platform.util.StringUtil;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
@@ -29,14 +30,15 @@
 import java.util.function.Consumer;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.http.HttpEntity;
+import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.methods.HttpRequestBase;
 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.HttpClients;
+import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.util.EntityUtils;
 
 /**
@@ -63,6 +65,14 @@ public static HttpClient build(String url) {
         return new HttpClient(url);
     }
 
+    private final static int HTTP_TIMEOUT = 5 * 1000;
+
+    private final RequestConfig config = RequestConfig.custom()
+        .setConnectTimeout(HTTP_TIMEOUT)
+        .setConnectionRequestTimeout(HTTP_TIMEOUT)
+        .setSocketTimeout(HTTP_TIMEOUT)
+        .build();
+
     private final String url;
 
     private HttpRequestBase httpRequest;
@@ -142,7 +152,7 @@ public HttpResponse<String> bodyAsString() {
 
         exec(httpResponse -> {
             if (httpResponse == null) {
-                wrapper.add(new HttpResponse<>(retried, EXCEPTION_STATUS_CODE, exceptions, ""));
+                wrapper.add(new HttpResponse<>(retried, EXCEPTION_STATUS_CODE, exceptions, StringUtil.EMPTY));
                 return;
             }
 
@@ -152,7 +162,7 @@ public HttpResponse<String> bodyAsString() {
                 wrapper.add(new HttpResponse<>(retried, statusCode, exceptions, body));
             } catch (IOException e) {
                 exceptions.add(e);
-                wrapper.add(new HttpResponse<>(retried, EXCEPTION_STATUS_CODE, exceptions, ""));
+                wrapper.add(new HttpResponse<>(retried, EXCEPTION_STATUS_CODE, exceptions, StringUtil.EMPTY));
             }
         });
 
@@ -186,7 +196,7 @@ private void exec(Consumer<CloseableHttpResponse> consumer) {
             return;
         }
 
-        try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+        try (CloseableHttpClient httpClient = HttpClientBuilder.create().setDefaultRequestConfig(config).build()) {
             try (CloseableHttpResponse response = httpClient.execute(httpRequest)) {
                 int statusCode = response.getStatusLine().getStatusCode();