fixing issues after rebasing
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/991da8ee Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/991da8ee Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/991da8ee Branch: refs/heads/stratos-4.1.x Commit: 991da8ee82135d10b76555f73f40777e30f8f93e Parents: 051b24c Author: Isuru Haththotuwa <isu...@apache.org> Authored: Fri Dec 25 19:26:43 2015 +0530 Committer: Isuru Haththotuwa <isu...@apache.org> Committed: Fri Dec 25 19:26:43 2015 +0530 ---------------------------------------------------------------------- .../CloudControllerServiceComponent.java | 3 ++- .../common/threading/StratosThreadPool.java | 28 -------------------- .../StratosManagerServiceComponent.java | 3 ++- .../internal/MessagingServiceComponent.java | 2 +- .../message/receiver/StratosEventReceiver.java | 7 ++--- 5 files changed, 7 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/991da8ee/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 74b9804..720bf17 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 @@ -230,6 +230,7 @@ public class CloudControllerServiceComponent { } // shutdown TopologyEventSync task - StratosThreadPool.shutdown(THREAD_POOL_ID); + StratosThreadPool.shutDownThreadPoolGracefully(THREAD_POOL_ID); + StratosThreadPool.shutDownScheduledThreadPoolGracefully(SCHEDULER_THREAD_POOL_ID); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/991da8ee/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 da48caf..1f4e5c8 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 @@ -233,32 +233,4 @@ public class StratosThreadPool { " and removed from the cache"); } } - - public static void shutdown (String identifier) { - - ExecutorService executorService = executorMap.get(identifier); - if (executorService == null) { - log.warn("No executor service found for id " + identifier + ", unable to shut down"); - return; - } - - // try to shut down gracefully - executorService.shutdown(); - // wait 10 secs till terminated - try { - if (!executorService.awaitTermination(10, TimeUnit.SECONDS)) { - log.info("Thread Pool [id] " + identifier + " did not finish all tasks before " + - "timeout, forcefully shutting down"); - executorService.shutdownNow(); - } - } catch (InterruptedException e) { - // interrupted, shutdown now - executorService.shutdownNow(); - } - - // remove from the map - executorServiceMap.remove(identifier); - - log.info("Successfully shutdown thread pool associated with id: " + identifier); - } } http://git-wip-us.apache.org/repos/asf/stratos/blob/991da8ee/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 04ec264..1b48603 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 @@ -329,6 +329,7 @@ public class StratosManagerServiceComponent { EventPublisherPool.close(MessagingUtil.Topics.TENANT_TOPIC.getTopicName()); // shut down the scheduled thread pool - StratosThreadPool.shutdown(THREAD_POOL_ID); + StratosThreadPool.shutDownThreadPoolGracefully(THREAD_POOL_ID); + StratosThreadPool.shutDownScheduledThreadPoolGracefully(SCHEDULER_THREAD_POOL_ID); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/991da8ee/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/internal/MessagingServiceComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/internal/MessagingServiceComponent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/internal/MessagingServiceComponent.java index b582d56..2136fe4 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/internal/MessagingServiceComponent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/internal/MessagingServiceComponent.java @@ -72,7 +72,7 @@ public class MessagingServiceComponent { InitializerEventReceiver.getInstance().terminate(); TenantEventReceiver.getInstance().terminate(); TopologyEventReceiver.getInstance().terminate(); - StratosThreadPool.shutdown(StratosEventReceiver.STRATOS_EVENT_RECEIEVER_THREAD_POOL_ID); + StratosThreadPool.shutDownThreadPoolGracefully(StratosEventReceiver.STRATOS_EVENT_RECEIEVER_THREAD_POOL_ID); if (log.isDebugEnabled()) { log.debug("Messaging Service component is deactivated"); } http://git-wip-us.apache.org/repos/asf/stratos/blob/991da8ee/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/StratosEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/StratosEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/StratosEventReceiver.java index 08d75a4..0c17efb 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/StratosEventReceiver.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/StratosEventReceiver.java @@ -25,8 +25,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.stratos.common.threading.StratosThreadPool; import org.apache.stratos.messaging.listener.EventListener; -import java.util.concurrent.ExecutorService; - /** * Abstraction for Event Receivers used in Stratos */ @@ -44,8 +42,6 @@ public abstract class StratosEventReceiver { // thread pool id protected String threadPoolId; - // executor service used - protected ExecutorService executorService; // pool size protected static int threadPoolSize = 25; @@ -67,7 +63,8 @@ public abstract class StratosEventReceiver { public StratosEventReceiver () { this.threadPoolId = STRATOS_EVENT_RECEIEVER_THREAD_POOL_ID; - this.executorService = StratosThreadPool.getExecutorService(threadPoolId, threadPoolSize); + this.executor = StratosThreadPool.getExecutorService(threadPoolId, (int)Math.ceil(threadPoolSize/3), + threadPoolSize); } /**
