Repository: stratos Updated Branches: refs/heads/master 126d39695 -> a9c0bb537
Rebase and merge changes of PR#131 Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1a6b1c1d Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1a6b1c1d Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1a6b1c1d Branch: refs/heads/master Commit: 1a6b1c1d82801c1cdee6a4e8221ea92620b721e6 Parents: 126d396 Author: gayan <[email protected]> Authored: Wed Dec 3 16:40:59 2014 +0530 Committer: gayan <[email protected]> Committed: Wed Dec 3 16:40:59 2014 +0530 ---------------------------------------------------------------------- .../health/AutoscalerHealthStatEventReceiver.java | 5 +---- .../internal/CloudControllerServiceComponent.java | 10 ++++------ .../receiver/application/ApplicationTopicReceiver.java | 3 ++- .../cluster/status/ClusterStatusTopicReceiver.java | 4 ++-- .../instance/status/InstanceStatusTopicReceiver.java | 1 + 5 files changed, 10 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/1a6b1c1d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/health/AutoscalerHealthStatEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/health/AutoscalerHealthStatEventReceiver.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/health/AutoscalerHealthStatEventReceiver.java index 2d5d1d8..7e8d1a9 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/health/AutoscalerHealthStatEventReceiver.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/health/AutoscalerHealthStatEventReceiver.java @@ -83,10 +83,7 @@ public class AutoscalerHealthStatEventReceiver { public void execute() { //FIXME this activated before autoscaler deployer activated. - try { - Thread.sleep(15000); - } catch (InterruptedException ignore) { - } + healthStatEventReceiver.setExecutorService(executorService); healthStatEventReceiver.execute(); if(log.isInfoEnabled()) { http://git-wip-us.apache.org/repos/asf/stratos/blob/1a6b1c1d/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 700efb9..8a5167d 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 @@ -26,7 +26,6 @@ import com.hazelcast.core.HazelcastInstance; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.cloud.controller.context.CloudControllerContext; import org.apache.stratos.cloud.controller.messaging.receiver.application.ApplicationTopicReceiver; import org.apache.stratos.cloud.controller.messaging.receiver.cluster.status.ClusterStatusTopicReceiver; import org.apache.stratos.cloud.controller.exception.CloudControllerException; @@ -36,7 +35,6 @@ import org.apache.stratos.cloud.controller.messaging.publisher.TopologySynchroni import org.apache.stratos.cloud.controller.messaging.receiver.instance.status.InstanceStatusTopicReceiver; import org.apache.stratos.common.clustering.DistributedObjectProvider; import org.apache.stratos.common.threading.StratosThreadPool; -import org.apache.stratos.common.util.ConfUtil; import org.apache.stratos.messaging.broker.publish.EventPublisherPool; import org.apache.stratos.messaging.util.Util; import org.osgi.framework.BundleContext; @@ -78,10 +76,9 @@ public class CloudControllerServiceComponent { protected void activate(ComponentContext context) { try { - XMLConfiguration conf = ConfUtil.getInstance(COMPONENTS_CONFIG).getConfiguration(); - int threadPoolSize = conf.getInt(THREAD_POOL_SIZE_KEY, THREAD_POOL_SIZE); - String threadIdentifier = conf.getString(THREAD_IDENTIFIER_KEY, DEFAULT_IDENTIFIER); - ExecutorService executorService = StratosThreadPool.getExecutorService(threadIdentifier, threadPoolSize); + + + ExecutorService executorService = StratosThreadPool.getExecutorService(DEFAULT_IDENTIFIER, THREAD_POOL_SIZE); applicationTopicReceiver = new ApplicationTopicReceiver(); applicationTopicReceiver.setExecutorService(executorService); applicationTopicReceiver.execute(); @@ -99,6 +96,7 @@ public class CloudControllerServiceComponent { } instanceStatusTopicReceiver = new InstanceStatusTopicReceiver(); + instanceStatusTopicReceiver.setExecutorService(executorService); instanceStatusTopicReceiver.execute(); if (log.isInfoEnabled()) { http://git-wip-us.apache.org/repos/asf/stratos/blob/1a6b1c1d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/application/ApplicationTopicReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/application/ApplicationTopicReceiver.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/application/ApplicationTopicReceiver.java index 22f1c5c..e8d3674 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/application/ApplicationTopicReceiver.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/application/ApplicationTopicReceiver.java @@ -48,8 +48,9 @@ public class ApplicationTopicReceiver { if (log.isInfoEnabled()) { log.info("Cloud controller application status thread started"); } - applicationsEventReceiver.execute(); applicationsEventReceiver.setExecutorService(executorService); + applicationsEventReceiver.execute(); + if (log.isInfoEnabled()) { log.info("Cloud controller application status thread terminated"); http://git-wip-us.apache.org/repos/asf/stratos/blob/1a6b1c1d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/cluster/status/ClusterStatusTopicReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/cluster/status/ClusterStatusTopicReceiver.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/cluster/status/ClusterStatusTopicReceiver.java index d54063c..6a5fd5a 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/cluster/status/ClusterStatusTopicReceiver.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/cluster/status/ClusterStatusTopicReceiver.java @@ -37,12 +37,12 @@ public class ClusterStatusTopicReceiver { public ClusterStatusTopicReceiver() { this.statusEventReceiver = new ClusterStatusEventReceiver(); - this.statusEventReceiver.setExecutorService(executorService); + addEventListeners(); } public void execute() { - + statusEventReceiver.setExecutorService(executorService); statusEventReceiver.execute(); if (log.isInfoEnabled()) { log.info("Cloud controller Cluster status thread started"); http://git-wip-us.apache.org/repos/asf/stratos/blob/1a6b1c1d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/instance/status/InstanceStatusTopicReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/instance/status/InstanceStatusTopicReceiver.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/instance/status/InstanceStatusTopicReceiver.java index dc21735..fde7bea 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/instance/status/InstanceStatusTopicReceiver.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/instance/status/InstanceStatusTopicReceiver.java @@ -50,6 +50,7 @@ public class InstanceStatusTopicReceiver { } public void execute() { + statusEventReceiver.setExecutorService(executorService); statusEventReceiver.execute(); if (log.isInfoEnabled()) { log.info("Cloud controller application status thread started");
