merge from develop

Author: Yang Guo

platform-api/src/main/java/com/flow/platform/api/controller/JobController.java

@@ -31,8 +31,6 @@
 import com.flow.platform.util.git.model.GitEventType;
 import com.google.common.collect.Lists;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;

platform-api/src/main/java/com/flow/platform/api/controller/ThreadConfigController.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright 2017 flow.ci
+ *
+ * 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.flow.platform.api.controller;
+
+import com.flow.platform.api.domain.request.ThreadConfigParam;
+import com.flow.platform.api.service.node.YmlService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author lhl
+ */
+@RestController
+@RequestMapping(path = "/thread/config")
+public class ThreadConfigController {
+
+    @Autowired
+    private YmlService ymlService;
+
+    /**
+     * @api {post}
+     * @apiName thread config
+     * @apiGroup Thread
+     * @apiDescription set thread config
+     *
+     * @apiParamExample {json} Request-Body:
+     *     {
+     *         "maxPoolSize": 1,
+     *         "corePoolSize": 1,
+     *         "queueSize": 2,
+     *         "threadNamePrefix": "git-fetch-task"
+     *     }
+     *
+     *  @apiSuccessExample {json} Success-Response:
+     *     HTTP/1.1 200 OK
+     *
+     */
+    @PostMapping
+    public void ymlConfigQueueSize(@RequestBody ThreadConfigParam threadConfigParam) {
+        ymlService.threadConfig(threadConfigParam);
+    }
+
+}

platform-api/src/main/java/com/flow/platform/api/domain/request/ThreadConfigParam.java

@@ -0,0 +1,73 @@
+/*
+ * Copyright 2017 flow.ci
+ *
+ * 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.flow.platform.api.domain.request;
+
+/**
+ * @author lhl
+ */
+public class ThreadConfigParam {
+
+    private Integer maxPoolSize;
+
+    private Integer corePoolSize;
+
+    private Integer queueSize;
+
+    private String threadNamePrefix;
+
+    public Integer getMaxPoolSize() {
+        return maxPoolSize;
+    }
+
+    public void setMaxPoolSize(Integer maxPoolSize) {
+        this.maxPoolSize = maxPoolSize;
+    }
+
+    public Integer getCorePoolSize() {
+        return corePoolSize;
+    }
+
+    public void setCorePoolSize(Integer corePoolSize) {
+        this.corePoolSize = corePoolSize;
+    }
+
+    public Integer getQueueSize() {
+        return queueSize;
+    }
+
+    public void setQueueSize(Integer queueSize) {
+        this.queueSize = queueSize;
+    }
+
+    public String getThreadNamePrefix() {
+        return threadNamePrefix;
+    }
+
+    public void setThreadNamePrefix(String threadNamePrefix) {
+        this.threadNamePrefix = threadNamePrefix;
+    }
+
+    public ThreadConfigParam(Integer maxPoolSize, Integer corePoolSize, Integer queueSize,
+                             String threadNamePrefix) {
+        this.maxPoolSize = maxPoolSize;
+        this.corePoolSize = corePoolSize;
+        this.queueSize = queueSize;
+        this.threadNamePrefix = threadNamePrefix;
+    }
+
+    public ThreadConfigParam() {
+    }
+}

platform-api/src/main/java/com/flow/platform/api/service/node/YmlService.java

@@ -18,6 +18,7 @@
 
 import com.flow.platform.api.domain.node.Node;
 import com.flow.platform.api.domain.node.Yml;
+import com.flow.platform.api.domain.request.ThreadConfigParam;
 import java.util.function.Consumer;
 
 /**
@@ -66,4 +67,11 @@ public interface YmlService {
      */
     void stopLoadYmlContent(Node root);
 
+    /**
+     * Config load yml thread pool
+     *
+     * @param threadConfigParam
+     */
+    void threadConfig(ThreadConfigParam threadConfigParam);
+
 }

platform-api/src/main/java/com/flow/platform/api/service/node/YmlServiceImpl.java

@@ -26,6 +26,7 @@
 import com.flow.platform.api.domain.envs.GitEnvs;
 import com.flow.platform.api.domain.node.Node;
 import com.flow.platform.api.domain.node.Yml;
+import com.flow.platform.api.domain.request.ThreadConfigParam;
 import com.flow.platform.api.exception.NodeSettingsException;
 import com.flow.platform.api.exception.YmlException;
 import com.flow.platform.api.service.CredentialService;
@@ -65,15 +66,15 @@ public class YmlServiceImpl implements YmlService, ContextEvent {
 
     private final static int NODE_THREAD_POOL_CACHE_SIZE = 100;
 
-    private final static int NODE_THREAD_POOL_SIZE = 1;
-
     // To cache thread pool for node path
     private Cache<String, ThreadPoolTaskExecutor> nodeThreadPool = CacheBuilder
         .newBuilder()
         .expireAfterAccess(NODE_THREAD_POOL_CACHE_EXPIRE, TimeUnit.SECONDS)
         .maximumSize(NODE_THREAD_POOL_CACHE_SIZE)
         .build();
 
+    private ThreadConfigParam threadConfigParam = new ThreadConfigParam(1, 1, 0, "git-fetch-task");
+
     @Autowired
     private GitService gitService;
 
@@ -194,6 +195,12 @@ public void stopLoadYmlContent(final Node root) {
         nodeService.updateYmlState(root, YmlStatusValue.NOT_FOUND, null);
     }
 
+    @Override
+    public void threadConfig(ThreadConfigParam threadConfigParam) {
+        this.threadConfigParam = threadConfigParam;
+        nodeThreadPool.invalidateAll();
+    }
+
     private boolean isYmlLoading(final Node node) {
         String ymlStatus = node.getEnv(FlowEnvs.FLOW_YML_STATUS);
         return YmlStatusValue.isLoadingStatus(ymlStatus);
@@ -247,7 +254,8 @@ private void findNodeCredential(Node node) {
     private ThreadPoolTaskExecutor findThreadPoolFromCache(String path) throws ExecutionException {
         return nodeThreadPool.get(path, () -> {
             ThreadPoolTaskExecutor taskExecutor = ThreadUtil
-                .createTaskExecutor(NODE_THREAD_POOL_SIZE, NODE_THREAD_POOL_SIZE, 0, "git-fetch-task");
+                .createTaskExecutor(threadConfigParam.getMaxPoolSize(), threadConfigParam.getCorePoolSize(),
+                    threadConfigParam.getQueueSize(), threadConfigParam.getThreadNamePrefix());
             taskExecutor.initialize();
             return taskExecutor;
         });

platform-api/src/main/java/com/flow/platform/api/util/I18nUtil.java

@@ -24,7 +24,7 @@
  */
 public class I18nUtil {
 
-    private static ResourceBundle resourceBundle = ResourceBundle.getBundle("i18n");
+    private static ResourceBundle resourceBundle;
 
     public static void initLocale(String language, String countryCode) {
         Locale.setDefault(new Locale(language, countryCode));