Repository: stratos Updated Branches: refs/heads/stratos-4.1.x 495ddb76e -> 2bb23ecd3
making cloud.controller.instance.manager.thread.pool size configurable Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2bb23ecd Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2bb23ecd Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2bb23ecd Branch: refs/heads/stratos-4.1.x Commit: 2bb23ecd36c9ec61acf2bd7e4e9b830dfb009cfe Parents: 495ddb7 Author: Isuru Haththotuwa <[email protected]> Authored: Fri Jan 8 11:06:26 2016 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Fri Jan 8 11:06:26 2016 +0530 ---------------------------------------------------------------------- .../controller/internal/CloudControllerServiceComponent.java | 2 +- .../controller/services/impl/CloudControllerServiceImpl.java | 8 ++++++-- .../cloud/controller/util/CloudControllerConstants.java | 1 + .../manager/internal/StratosManagerServiceComponent.java | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/2bb23ecd/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java index 4089ccd..fd7e0b2 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java @@ -75,7 +75,7 @@ public class CloudControllerServiceComponent { private static final String CLOUD_CONTROLLER_COORDINATOR_LOCK = "cloud.controller.coordinator.lock"; private static final String THREAD_POOL_ID = "cloud.controller.thread.pool"; private static final String SCHEDULER_THREAD_POOL_ID = "cloud.controller.scheduler.thread.pool"; - private static final int THREAD_POOL_SIZE = 20; + private static final int THREAD_POOL_SIZE = 10; private static final int SCHEDULER_THREAD_POOL_SIZE = 5; private ClusterStatusTopicReceiver clusterStatusTopicReceiver; http://git-wip-us.apache.org/repos/asf/stratos/blob/2bb23ecd/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java index f5901e1..4bbffbf 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java @@ -66,8 +66,12 @@ public class CloudControllerServiceImpl implements CloudControllerService { public CloudControllerServiceImpl() { Integer ratio = Integer.getInteger(StratosConstants.THREAD_POOL_INITIAL_MIN_MAX_RATIO); int divisor = ratio != null && ratio >= 1 ? ratio : StratosConstants.DEFAULT_THREAD_POOL_MIN_MAX_RATIO; - executor = StratosThreadPool.getExecutorService("cloud.controller.instance.manager.thread" + - ".pool", 50/divisor, 50); + Integer ccInstanceMgtThreadCount = Integer.getInteger(CloudControllerConstants.INSTANCE_MGT_THREAD_POOL_SIZE); + if (ccInstanceMgtThreadCount == null || ccInstanceMgtThreadCount <= 0) { + ccInstanceMgtThreadCount = 50; + } + executor = StratosThreadPool.getExecutorService("cloud.controller.instance.manager.thread.pool", + ((int)Math.ceil(ccInstanceMgtThreadCount/divisor)), ccInstanceMgtThreadCount); } http://git-wip-us.apache.org/repos/asf/stratos/blob/2bb23ecd/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java index bc957c0..e3e9b4f 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java @@ -351,4 +351,5 @@ public final class CloudControllerConstants { public static final String INSTANCE_CTXT_EC2_AVAILABILITY_ZONE = "EC2_AVAILABILITY_ZONE"; public static final String CC_THREAD_POOL_SIZE = "cc.thread.pool.size"; + public static final String INSTANCE_MGT_THREAD_POOL_SIZE = "cloud.controller.instance.manager.thread.pool.size"; } http://git-wip-us.apache.org/repos/asf/stratos/blob/2bb23ecd/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java index dab0540..dc965d7 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java @@ -86,7 +86,7 @@ public class StratosManagerServiceComponent { private static final String THREAD_POOL_ID = "stratos.manager.thread.pool"; private static final String SCHEDULER_THREAD_POOL_ID = "stratos.manager.scheduler.thread.pool"; private static final String STRATOS_MANAGER_COORDINATOR_LOCK = "stratos.manager.coordinator.lock"; - private static final int THREAD_POOL_SIZE = 20; + private static final int THREAD_POOL_SIZE = 10; private static final int SCHEDULER_THREAD_POOL_SIZE = 5; private StratosManagerTopologyEventReceiver topologyEventReceiver;
