removing ThreadPoolExecutor from StratosThreadPool temporarily
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d4d27629 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d4d27629 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d4d27629 Branch: refs/heads/stratos-4.1.x Commit: d4d27629fdc7629a146fd13bc8fafd830b5cb8ec Parents: 78ff21c Author: Isuru Haththotuwa <isu...@apache.org> Authored: Thu Dec 3 10:02:44 2015 +0530 Committer: Isuru Haththotuwa <isu...@apache.org> Committed: Mon Dec 7 18:48:09 2015 +0530 ---------------------------------------------------------------------- .../cloud/controller/context/CloudControllerContext.java | 2 -- .../org/apache/stratos/common/threading/StratosThreadPool.java | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/d4d27629/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java index 0d2e8bc..4d28dd5 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java @@ -22,7 +22,6 @@ import org.apache.axis2.engine.AxisConfiguration; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.cloud.controller.config.CloudControllerConfig; import org.apache.stratos.cloud.controller.domain.*; import org.apache.stratos.cloud.controller.domain.kubernetes.KubernetesCluster; import org.apache.stratos.cloud.controller.domain.kubernetes.KubernetesClusterContext; @@ -31,7 +30,6 @@ import org.apache.stratos.cloud.controller.domain.kubernetes.KubernetesMaster; import org.apache.stratos.cloud.controller.exception.InvalidIaasProviderException; import org.apache.stratos.cloud.controller.exception.NonExistingKubernetesClusterException; import org.apache.stratos.cloud.controller.exception.NonExistingKubernetesHostException; -import org.apache.stratos.cloud.controller.iaases.Iaas; import org.apache.stratos.cloud.controller.internal.ServiceReferenceHolder; import org.apache.stratos.cloud.controller.registry.RegistryManager; import org.apache.stratos.cloud.controller.util.CloudControllerConstants; http://git-wip-us.apache.org/repos/asf/stratos/blob/d4d27629/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/threading/StratosThreadPool.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/threading/StratosThreadPool.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/threading/StratosThreadPool.java index b4784a4..efa567e 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/threading/StratosThreadPool.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/threading/StratosThreadPool.java @@ -50,8 +50,9 @@ public class StratosThreadPool { if (executorService == null) { synchronized (executorServiceMapLock) { if (executorService == null) { - executorService = new ThreadPoolExecutor(25, threadPoolSize, 60L, TimeUnit.SECONDS, - new LinkedBlockingQueue<Runnable>(), new StratosThreadFactory(identifier)); +// executorService = new ThreadPoolExecutor(25, threadPoolSize, 60L, TimeUnit.SECONDS, +// new LinkedBlockingQueue<Runnable>(), new StratosThreadFactory(identifier)); + executorService = Executors.newFixedThreadPool(threadPoolSize, new StratosThreadFactory(identifier)); executorServiceMap.put(identifier, executorService); log.info(String.format("Thread pool created: [type] Executor Service [id] %s [size] %d", identifier, threadPoolSize)); }
