fixing conflicts
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/90dc0624 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/90dc0624 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/90dc0624 Branch: refs/heads/stratos-4.1.x Commit: 90dc06245d03f18ba3d71a6549be3aeed2fa124f Parents: 4ef0b6e 8033fd3 Author: Isuru Haththotuwa <[email protected]> Authored: Tue Jan 5 16:54:49 2016 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Tue Jan 5 16:54:49 2016 +0530 ---------------------------------------------------------------------- .../AutoscalerTopologyEventReceiver.java | 11 --------- .../agent/test/JavaCartridgeAgentTest.java | 5 ++-- .../CloudControllerServiceComponent.java | 2 +- .../status/ClusterStatusTopicReceiver.java | 25 -------------------- .../initializer/InitializerTopicReceiver.java | 18 -------------- .../extension/api/LoadBalancerExtension.java | 10 +++----- .../internal/LoadBalancerServiceComponent.java | 7 ++++++ .../StratosManagerInitializerTopicReceiver.java | 19 --------------- .../application/ApplicationsEventReceiver.java | 1 + .../signup/ApplicationSignUpEventReceiver.java | 1 + .../status/ClusterStatusEventReceiver.java | 1 - .../mapping/DomainMappingEventReceiver.java | 1 + .../health/stat/HealthStatEventReceiver.java | 1 + .../status/InstanceStatusEventReceiver.java | 1 + .../receiver/tenant/TenantEventReceiver.java | 1 + .../topology/TopologyEventReceiver.java | 1 + .../MetadataApplicationEventReceiver.java | 18 -------------- .../service/MetadataTopologyEventReceiver.java | 25 -------------------- .../mock/iaas/services/impl/MockInstance.java | 15 ------------ .../org/apache/stratos/aws/extension/Main.java | 6 +---- .../tests/PythonAgentIntegrationTest.java | 1 - .../integration/common/TopologyHandler.java | 1 - 22 files changed, 22 insertions(+), 149 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/90dc0624/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java ---------------------------------------------------------------------- diff --cc components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java index 5f123b2,e2b417e..0675342 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java @@@ -47,8 -47,8 +47,6 @@@ import org.apache.stratos.messaging.lis import org.apache.stratos.messaging.message.receiver.topology.TopologyEventReceiver; import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; --import java.util.concurrent.ExecutorService; -- /** * Autoscaler topology receiver. */ @@@ -63,15 -63,15 +61,6 @@@ public class AutoscalerTopologyEventRec addEventListeners(); } --// public void execute() { --// //FIXME this activated before autoscaler deployer activated. - // // topologyEventReceiver.setExecutor(getExecutor()); -// // topologyEventReceiver.setExecutorService(getExecutorService()); --// //topologyEventReceiver.execute(); --// if (log.isInfoEnabled()) { --// log.info("Autoscaler topology receiver thread started"); --// } --// } -- private void addEventListeners() { // Listen to topology events that affect clusters topologyEventReceiver.addEventListener(new CompleteTopologyEventListener() { http://git-wip-us.apache.org/repos/asf/stratos/blob/90dc0624/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java ---------------------------------------------------------------------- diff --cc components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java index e6b7b98,903fa58..3fa4097 --- a/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java +++ b/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java @@@ -121,10 -121,14 +121,11 @@@ public class JavaCartridgeAgentTest String agentHome = setupJavaAgent(); - // ExecutorService executorService = StratosThreadPool.getExecutorService("TEST_THREAD_POOL", 5); - ExecutorService executorService = StratosThreadPool.getExecutorService("TEST_THREAD_POOL", 5); topologyEventReceiver = TopologyEventReceiver.getInstance(); - //topologyEventReceiver.setExecutorService(executorService); - //topologyEventReceiver.execute(); -- instanceStatusEventReceiver = InstanceStatusEventReceiver.getInstance(); -// instanceStatusEventReceiver.setExecutorService(executorService); -// instanceStatusEventReceiver.execute(); ++ topologyEventReceiver = TopologyEventReceiver.getInstance(); ++ instanceStatusEventReceiver = InstanceStatusEventReceiver.getInstance(); ++ instanceStarted = false; instanceStatusEventReceiver.addEventListener(new InstanceStartedEventListener() { http://git-wip-us.apache.org/repos/asf/stratos/blob/90dc0624/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java ---------------------------------------------------------------------- diff --cc components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java index 569d566,5b01330..4089ccd --- 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 @@@ -237,8 -230,7 +237,8 @@@ public class CloudControllerServiceComp log.warn("An error occurred while closing cloud controller topology event publisher", e); } -- // shutdown TopologyEventSync task - StratosThreadPool.shutdown(THREAD_POOL_ID); ++ // shutdown + StratosThreadPool.shutDownThreadPoolGracefully(THREAD_POOL_ID); + StratosThreadPool.shutDownScheduledThreadPoolGracefully(SCHEDULER_THREAD_POOL_ID); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/90dc0624/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/cluster/status/ClusterStatusTopicReceiver.java ---------------------------------------------------------------------- diff --cc components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/cluster/status/ClusterStatusTopicReceiver.java index a7c0947,e0b9f62..eead96f --- 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 @@@ -27,29 -27,29 +27,16 @@@ import org.apache.stratos.messaging.lis import org.apache.stratos.messaging.message.receiver.cluster.status.ClusterStatusEventReceiver; import org.wso2.carbon.registry.core.exceptions.RegistryException; --import java.util.concurrent.ExecutorService; -- public class ClusterStatusTopicReceiver { private static final Log log = LogFactory.getLog(ClusterStatusTopicReceiver.class); private ClusterStatusEventReceiver clusterStatusEventReceiver; -- //private boolean terminated; - //private ExecutorService executor; - //private ExecutorService executorService; public ClusterStatusTopicReceiver() { this.clusterStatusEventReceiver = ClusterStatusEventReceiver.getInstance(); addEventListeners(); } --// public void execute() { - // clusterStatusEventReceiver.setExecutorService(executor); -// clusterStatusEventReceiver.setExecutorService(executorService); --// clusterStatusEventReceiver.execute(); --// if (log.isInfoEnabled()) { --// log.info("Cloud controller Cluster status thread started"); --// } --// --// } -- private void addEventListeners() { // Listen to topology events that affect clusters clusterStatusEventReceiver.addEventListener(new ClusterStatusClusterResetEventListener() { @@@ -114,16 -114,16 +101,4 @@@ } }); } -- --// public void setTerminated(boolean terminated) { --// this.terminated = terminated; --// } --// - // public ExecutorService getExecutor() { - // return executor; -// public ExecutorService getExecutorService() { -// return executorService; --// } --// - // public void setExecutorService(ExecutorService executor) { - // this.executor = executor; -// public void setExecutorService(ExecutorService executorService) { -// this.executorService = executorService; --// } } http://git-wip-us.apache.org/repos/asf/stratos/blob/90dc0624/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/initializer/InitializerTopicReceiver.java ---------------------------------------------------------------------- diff --cc components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/initializer/InitializerTopicReceiver.java index 4d31058,9a2c502..f4e30c8 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/initializer/InitializerTopicReceiver.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/initializer/InitializerTopicReceiver.java @@@ -26,8 -26,8 +26,6 @@@ import org.apache.stratos.messaging.eve import org.apache.stratos.messaging.listener.initializer.CompleteTopologyRequestEventListener; import org.apache.stratos.messaging.message.receiver.initializer.InitializerEventReceiver; --import java.util.concurrent.ExecutorService; -- public class InitializerTopicReceiver { private static final Log log = LogFactory.getLog(InitializerTopicReceiver.class); private InitializerEventReceiver initializerEventReceiver; @@@ -38,14 -38,14 +36,6 @@@ addEventListeners(); } --// public void execute() { - // initializerEventReceiver.setExecutorService(executor); -// initializerEventReceiver.setExecutorService(executorService); --// initializerEventReceiver.execute(); --// if (log.isInfoEnabled()) { --// log.info("Autoscaler initializer topic receiver started"); --// } --// } -- private void addEventListeners() { initializerEventReceiver.addEventListener(new CompleteTopologyRequestEventListener() { @Override @@@ -61,12 -61,12 +51,4 @@@ } }); } -- - // public ExecutorService getExecutor() { - // return executor; -// public ExecutorService getExecutorService() { -// return executorService; --// } --// - // public void setExecutorService(ExecutorService executor) { - // this.executor = executor; -// public void setExecutorService(ExecutorService executorService) { -// this.executorService = executorService; --// } } http://git-wip-us.apache.org/repos/asf/stratos/blob/90dc0624/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancerExtension.java ---------------------------------------------------------------------- diff --cc components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancerExtension.java index 838f0fc,ec1ddbc..7364d98 --- a/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancerExtension.java +++ b/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancerExtension.java @@@ -124,8 -125,8 +124,7 @@@ public class LoadBalancerExtension addTopologyEventListeners(topologyEventReceiver); // Add default topology provider event listeners topologyEventReceiver.addEventListeners(); - // topologyEventReceiver.setExecutorService(executor); -// topologyEventReceiver.setExecutorService(executorService); --// topologyEventReceiver.execute(); ++ if (log.isInfoEnabled()) { log.info("Topology receiver thread started"); } @@@ -148,10 -149,10 +147,9 @@@ } } - private void startApplicationEventReceiver(ExecutorService executorService) { + private void startApplicationEventReceiver() { applicationsEventReceiver = ApplicationsEventReceiver.getInstance(); - // applicationsEventReceiver.setExecutorService(executor); -// applicationsEventReceiver.setExecutorService(executorService); --// applicationsEventReceiver.execute(); ++ if (log.isInfoEnabled()) { log.info("Application event receiver thread started"); } @@@ -160,18 -161,18 +158,16 @@@ /** * Start domain mapping event receiver thread. * -- * @param executorService executor service instance * @param topologyProvider topology receiver instance */ - private void startDomainMappingEventReceiver(ExecutorService executorService, TopologyProvider topologyProvider) { + private void startDomainMappingEventReceiver(TopologyProvider topologyProvider) { // Enforcing the listener order in order execute extension listener later domainMappingEventReceiver = new LoadBalancerCommonDomainMappingEventReceiver(topologyProvider, false); // Add extension event listeners addDomainMappingsEventListeners(domainMappingEventReceiver); // Add default domain mapping event listeners domainMappingEventReceiver.addEventListeners(); - // domainMappingEventReceiver.setExecutorService(executor); -// domainMappingEventReceiver.setExecutorService(executorService); --// domainMappingEventReceiver.execute(); ++ if (log.isInfoEnabled()) { log.info("Domain mapping event receiver thread started"); } http://git-wip-us.apache.org/repos/asf/stratos/blob/90dc0624/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java ---------------------------------------------------------------------- diff --cc components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java index 65ca89a,b235208..feedc9b --- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java +++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java @@@ -120,9 -120,6 +120,12 @@@ public class LoadBalancerServiceCompone // Configure topology filters TopologyFilterConfigurator.configure(configuration); ++<<<<<<< HEAD +// int threadPoolSize = Integer.getInteger(LoadBalancerConstants.LOAD_BALANCER_THREAD_POOL_SIZE_KEY, +// LoadBalancerConstants.LOAD_BALANCER_DEFAULT_THREAD_POOL_SIZE); + ++======= ++>>>>>>> stratos-4.1.x TopologyProvider topologyProvider = LoadBalancerConfiguration.getInstance().getTopologyProvider(); if (topologyProvider == null) { topologyProvider = new TopologyProvider(); @@@ -161,8 -158,7 +164,12 @@@ } } ++<<<<<<< HEAD + private void startDomainMappingEventReceiver( TopologyProvider topologyProvider) { + ++======= + private void startDomainMappingEventReceiver(TopologyProvider topologyProvider) { ++>>>>>>> stratos-4.1.x if (domainMappingEventReceiver != null) { return; } http://git-wip-us.apache.org/repos/asf/stratos/blob/90dc0624/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/receiver/StratosManagerInitializerTopicReceiver.java ---------------------------------------------------------------------- diff --cc components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/receiver/StratosManagerInitializerTopicReceiver.java index 5f7bc53,c08e8e4..bc7ae2d --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/receiver/StratosManagerInitializerTopicReceiver.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/receiver/StratosManagerInitializerTopicReceiver.java @@@ -28,12 -28,12 +28,9 @@@ import org.apache.stratos.messaging.lis import org.apache.stratos.messaging.listener.initializer.CompleteTenantRequestEventListener; import org.apache.stratos.messaging.message.receiver.initializer.InitializerEventReceiver; --import java.util.concurrent.ExecutorService; -- public class StratosManagerInitializerTopicReceiver { private static final Log log = LogFactory.getLog(StratosManagerInitializerTopicReceiver.class); private InitializerEventReceiver initializerEventReceiver; - //private ExecutorService executor; - //private ExecutorService executorService; private ApplicationSignUpHandler applicationSignUpHandler; public StratosManagerInitializerTopicReceiver() { @@@ -42,14 -42,14 +39,6 @@@ addEventListeners(); } --// public void execute() { - // initializerEventReceiver.setExecutorService(executor); -// initializerEventReceiver.setExecutorService(executorService); --// initializerEventReceiver.execute(); --// if (log.isInfoEnabled()) { --// log.info("Stratos manager initializer topic receiver started"); --// } --// } -- private void addEventListeners() { initializerEventReceiver.addEventListener(new CompleteTenantRequestEventListener() { @Override @@@ -80,12 -80,12 +69,4 @@@ } }); } -- --// public ExecutorService getExecutorService() { - // return executor; -// return executorService; --// } --// - // public void setExecutorService(ExecutorService executor) { - // this.executor = executor; -// public void setExecutorService(ExecutorService executorService) { -// this.executorService = executorService; --// } } http://git-wip-us.apache.org/repos/asf/stratos/blob/90dc0624/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationsEventReceiver.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/90dc0624/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/signup/ApplicationSignUpEventReceiver.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/90dc0624/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventReceiver.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/90dc0624/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingEventReceiver.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/90dc0624/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/90dc0624/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventReceiver.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/90dc0624/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventReceiver.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/90dc0624/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventReceiver.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/90dc0624/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/MetadataApplicationEventReceiver.java ---------------------------------------------------------------------- diff --cc components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/MetadataApplicationEventReceiver.java index d9934db,e1bf929..eda63ea --- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/MetadataApplicationEventReceiver.java +++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/MetadataApplicationEventReceiver.java @@@ -21,7 -21,7 +21,6 @@@ package org.apache.stratos.metadata.ser import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.common.concurrent.locks.ReadWriteLock; --import org.apache.stratos.common.threading.StratosThreadPool; import org.apache.stratos.messaging.domain.application.Application; import org.apache.stratos.messaging.domain.application.ApplicationStatus; import org.apache.stratos.messaging.domain.application.Applications; @@@ -32,7 -32,7 +31,6 @@@ import org.apache.stratos.messaging.mes import org.apache.stratos.metadata.service.registry.MetadataApiRegistry; import java.util.Map; --import java.util.concurrent.ExecutorService; /** * Application receiver class for metadata service @@@ -40,12 -40,12 +38,9 @@@ public class MetadataApplicationEventReceiver { private static final Log log = LogFactory.getLog(MetadataApplicationEventReceiver.class); private ApplicationsEventReceiver applicationsEventReceiver; - //private ExecutorService executor; - //private ExecutorService executorService; public MetadataApplicationEventReceiver() { this.applicationsEventReceiver = ApplicationsEventReceiver.getInstance(); - //executor = StratosThreadPool.getExecutorService(Constants - //executorService = StratosThreadPool.getExecutorService(Constants -- // .METADATA_SERVICE_THREAD_POOL_ID, 20); addEventListeners(); } @@@ -71,15 -71,15 +66,6 @@@ }); } --// public void execute() { --// applicationsEventReceiver.setExecutorService(getExecutorService()); --// applicationsEventReceiver.execute(); --// --// if (log.isInfoEnabled()) { --// log.info("Metadata service application receiver started."); --// } --// } -- public void terminate() { applicationsEventReceiver.terminate(); if (log.isInfoEnabled()) { @@@ -87,8 -87,8 +73,4 @@@ } } -- // public ExecutorService getExecutorService() { - // return executor; -// return executorService; --// } -- } http://git-wip-us.apache.org/repos/asf/stratos/blob/90dc0624/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/MetadataTopologyEventReceiver.java ---------------------------------------------------------------------- diff --cc components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/MetadataTopologyEventReceiver.java index 44a210d,f16282d..f0b96a0 --- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/MetadataTopologyEventReceiver.java +++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/MetadataTopologyEventReceiver.java @@@ -21,7 -21,7 +21,6 @@@ package org.apache.stratos.metadata.ser import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.common.concurrent.locks.ReadWriteLock; --import org.apache.stratos.common.threading.StratosThreadPool; import org.apache.stratos.messaging.event.Event; import org.apache.stratos.messaging.event.topology.ApplicationClustersCreatedEvent; import org.apache.stratos.messaging.event.topology.ApplicationClustersRemovedEvent; @@@ -30,8 -30,8 +29,6 @@@ import org.apache.stratos.messaging.lis import org.apache.stratos.messaging.message.receiver.topology.TopologyEventReceiver; import org.apache.stratos.metadata.service.registry.MetadataApiRegistry; --import java.util.concurrent.ExecutorService; -- /** * Topology receiver class for metadata service */ @@@ -42,8 -42,8 +39,6 @@@ public class MetadataTopologyEventRecei public MetadataTopologyEventReceiver() { this.topologyEventReceiver = TopologyEventReceiver.getInstance(); - // //executor = StratosThreadPool.getExecutorService(Constants -// //executorService = StratosThreadPool.getExecutorService(Constants --// .METADATA_SERVICE_THREAD_POOL_ID, 20); addEventListeners(); } @@@ -67,24 -67,24 +62,4 @@@ } }); } -- --// public void execute() { --// topologyEventReceiver.setExecutorService(getExecutorService()); --// topologyEventReceiver.execute(); --// --// if (log.isInfoEnabled()) { --// log.info("Metadata service topology receiver started."); --// } --// } --// --// public void terminate() { --// topologyEventReceiver.terminate(); --// if (log.isInfoEnabled()) { --// log.info("Metadata service topology receiver stopped."); --// } --// } -- - // public ExecutorService getExecutorService() { - // return executorService; - // } - public ExecutorService getExecutorService() { - return executorService; - } } http://git-wip-us.apache.org/repos/asf/stratos/blob/90dc0624/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/impl/MockInstance.java ---------------------------------------------------------------------- diff --cc components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/impl/MockInstance.java index 27a664e,9886335..25e953b --- a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/impl/MockInstance.java +++ b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/impl/MockInstance.java @@@ -148,8 -151,8 +148,6 @@@ public class MockInstance implements Se } } }); - // topologyEventReceiver.setExecutorService(eventListenerExecutor); -// topologyEventReceiver.setExecutorService(eventListenerExecutorService); --// topologyEventReceiver.execute(); if (log.isDebugEnabled()) { log.debug(String.format( "Mock instance topology event message receiver started for mock member [member-id] %s", @@@ -180,19 -183,19 +178,6 @@@ } } }); -- // TODO: Fix InstanceNotifierEventReceiver to use executor service -- // do not remove this since execute() is a blocking call - // eventListenerExecutor.submit(new Runnable() { -// eventListenerExecutorService.submit(new Runnable() { --// @Override --// public void run() { --// instanceNotifierEventReceiver.execute(); --// } --// }); --// if (log.isDebugEnabled()) { --// log.debug(String.format( --// "Mock instance instance notifier event message receiver started for mock member [member-id] %s", --// mockInstanceContext.getMemberId())); --// } } private void handleMemberTermination() { http://git-wip-us.apache.org/repos/asf/stratos/blob/90dc0624/extensions/load-balancer/modules/aws-extension/src/main/java/org/apache/stratos/aws/extension/Main.java ---------------------------------------------------------------------- diff --cc extensions/load-balancer/modules/aws-extension/src/main/java/org/apache/stratos/aws/extension/Main.java index 7a58df9,0ea2005..a8b436d --- a/extensions/load-balancer/modules/aws-extension/src/main/java/org/apache/stratos/aws/extension/Main.java +++ b/extensions/load-balancer/modules/aws-extension/src/main/java/org/apache/stratos/aws/extension/Main.java @@@ -22,12 -22,12 +22,8 @@@ package org.apache.stratos.aws.extensio import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.log4j.PropertyConfigurator; --import org.apache.stratos.common.threading.StratosThreadPool; --import org.apache.stratos.load.balancer.common.topology.TopologyProvider; --import org.apache.stratos.load.balancer.extension.api.LoadBalancerExtension; --import org.apache.stratos.load.balancer.extension.api.exception.LoadBalancerExtensionException; -import java.util.concurrent.ExecutorService; +import java.util.concurrent.ThreadPoolExecutor; /** * AWS extension main class. @@@ -35,10 -35,10 +31,11 @@@ public class Main { private static final Log log = LogFactory.getLog(Main.class); - public static final String AWS_EXTENSION_THREAD_POOL = "aws.extension.thread.pool"; - public static final int THREAD_POOL_SIZE =2; - private static ExecutorService executorService; + private static ThreadPoolExecutor executor; +// public static final String AWS_EXTENSION_THREAD_POOL = "aws.extension.thread.pool"; +// public static final int THREAD_POOL_SIZE = 10; + + public static void main(String[] args) { LoadBalancerExtension extension = null; @@@ -55,13 -54,12 +52,12 @@@ // Validate runtime parameters AWSExtensionContext.getInstance().validate(); TopologyProvider topologyProvider = new TopologyProvider(); - AWSStatisticsReader statisticsReader = - AWSExtensionContext.getInstance().isCEPStatsPublisherEnabled() ? new AWSStatisticsReader( - topologyProvider) : null; - extension = new LoadBalancerExtension(new AWSLoadBalancer(), statisticsReader, topologyProvider); - extension.setExecutorService(executorService); - extension.execute(); + AWSStatisticsReader statisticsReader = AWSExtensionContext + .getInstance().isCEPStatsPublisherEnabled() ? new AWSStatisticsReader( + topologyProvider) : null; + extension = new LoadBalancerExtension(new AWSLoadBalancer(), + statisticsReader, topologyProvider); + extension.setExecutorService(executor); - extension.execute(); // Add shutdown hook final Thread mainThread = Thread.currentThread(); http://git-wip-us.apache.org/repos/asf/stratos/blob/90dc0624/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/PythonAgentIntegrationTest.java ---------------------------------------------------------------------- diff --cc products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/PythonAgentIntegrationTest.java index 860e019,235a992..52c248d --- a/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/PythonAgentIntegrationTest.java +++ b/products/python-cartridge-agent/modules/integration/test-integration/src/test/java/org/apache/stratos/python/cartridge/agent/integration/tests/PythonAgentIntegrationTest.java @@@ -123,9 -123,15 +123,8 @@@ public abstract class PythonAgentIntegr startActiveMQInstance(Integer.parseInt(amqpBindPorts[i]), Integer.parseInt(mqttBindPorts[i]), true); } - //ExecutorService executorService = StratosThreadPool.getExecutorService - // ("TEST_THREAD_POOL"); topologyEventReceiver = TopologyEventReceiver.getInstance(); -// topologyEventReceiver.setExecutorService(executorService); -// topologyEventReceiver.execute(); -- instanceStatusEventReceiver = InstanceStatusEventReceiver.getInstance(); -// instanceStatusEventReceiver.setExecutorService(executorService); -// instanceStatusEventReceiver.execute(); instanceStatusEventReceiver.addEventListener(new InstanceStartedEventListener() { @Override http://git-wip-us.apache.org/repos/asf/stratos/blob/90dc0624/products/stratos/modules/integration/test-common/src/main/java/org/apache/stratos/integration/common/TopologyHandler.java ----------------------------------------------------------------------
