Repository: stratos Updated Branches: refs/heads/docker-grouping-merge e819fad7b -> 71e8ac293
Fixing compilation errors in CC Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/fad19f3d Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/fad19f3d Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/fad19f3d Branch: refs/heads/docker-grouping-merge Commit: fad19f3d57dd5ab177090436e77c42118fc9fb09 Parents: fb80e2c Author: lasinducharith <[email protected]> Authored: Mon Nov 3 14:42:18 2014 +0530 Committer: lasinducharith <[email protected]> Committed: Mon Nov 3 14:48:28 2014 +0530 ---------------------------------------------------------------------- .../impl/CloudControllerServiceImpl.java | 29 ----- .../internal/CloudControllerDSComponent.java | 9 +- .../controller/topology/TopologyBuilder.java | 109 ------------------- .../topology/TopologyEventPublisher.java | 9 -- 4 files changed, 3 insertions(+), 153 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/fad19f3d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java index 10b0730..04e365a 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java @@ -25,7 +25,6 @@ import org.apache.commons.collections.ListUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.cloud.controller.application.parser.DefaultApplicationParser; import org.apache.stratos.cloud.controller.concurrent.PartitionValidatorCallable; import org.apache.stratos.cloud.controller.concurrent.ScheduledThreadExecutor; import org.apache.stratos.cloud.controller.concurrent.ThreadExecutor; @@ -34,12 +33,10 @@ import org.apache.stratos.cloud.controller.exception.*; import org.apache.stratos.cloud.controller.functions.ContainerClusterContextToKubernetesService; import org.apache.stratos.cloud.controller.functions.ContainerClusterContextToReplicationController; import org.apache.stratos.cloud.controller.functions.PodToMemberContext; -import org.apache.stratos.cloud.controller.interfaces.ApplicationParser; import org.apache.stratos.cloud.controller.interfaces.CloudControllerService; import org.apache.stratos.cloud.controller.interfaces.Iaas; import org.apache.stratos.cloud.controller.persist.Deserializer; import org.apache.stratos.cloud.controller.pojo.*; -import org.apache.stratos.cloud.controller.pojo.application.ApplicationContext; import org.apache.stratos.cloud.controller.publisher.CartridgeInstanceDataPublisher; import org.apache.stratos.cloud.controller.registry.RegistryManager; import org.apache.stratos.cloud.controller.runtime.FasterLookUpDataHolder; @@ -65,7 +62,6 @@ import org.jclouds.compute.domain.NodeMetadataBuilder; import org.jclouds.compute.domain.Template; import org.jclouds.rest.ResourceNotFoundException; import org.wso2.carbon.registry.core.exceptions.RegistryException; -import org.apache.stratos.messaging.domain.topology.Application; import java.util.*; import java.util.Map.Entry; @@ -1430,25 +1426,6 @@ public class CloudControllerServiceImpl implements CloudControllerService { return dataHolder.getClusterContext(clusterId); } - public void deployApplicationDefinition (ApplicationContext applicationContext) throws ApplicationDefinitionException { - - ApplicationParser applicationParser = new DefaultApplicationParser(); - Application application = applicationParser.parse(applicationContext); - - // Create a Cluster Context obj. for each of the Clusters in the Application - for (ApplicationClusterContext applicationClusterContext : applicationParser.getApplicationClusterContexts()) { - dataHolder.addClusterContext(new ClusterContext(applicationClusterContext.getClusterId(), - applicationClusterContext.getCartridgeType(), applicationClusterContext.getTextPayload(), - applicationClusterContext.getHostName(), applicationClusterContext.isLbCluster(), - CloudControllerUtil.toJavaUtilProperties(applicationClusterContext.getProperties()))); - } - - TopologyBuilder.handleApplicationDeployed(application, applicationParser.getApplicationClusterContexts(), - applicationParser.getPayloadData()); - - persist(); - } - @Override public MemberContext[] startContainers(ContainerClusterContext containerClusterContext) throws UnregisteredCartridgeException { @@ -1865,12 +1842,6 @@ public class CloudControllerServiceImpl implements CloudControllerService { } @Override - public void unDeployApplicationDefinition(String applicationId, int tenantId, String tenantDomain) throws ApplicationDefinitionException { - - TopologyBuilder.handleApplicationUndeployed(applicationId); - } - - @Override public MemberContext terminateContainer(String memberId) throws MemberTerminationFailedException { handleNullObject(memberId, "Failed to terminate member. Invalid Member id. [Member id] " + memberId); http://git-wip-us.apache.org/repos/asf/stratos/blob/fad19f3d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerDSComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerDSComponent.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerDSComponent.java index 19efc44..b286390 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerDSComponent.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerDSComponent.java @@ -82,13 +82,10 @@ public class CloudControllerDSComponent { log.info("Instance status message receiver thread started"); } - ApplicationStatusTopicReceiver applicationStatusTopicReceiver = new ApplicationStatusTopicReceiver(); - Thread appThread = new Thread(applicationStatusTopicReceiver); clusterStatusTopicReceiver = new ClusterStatusTopicReceiver(); - Thread appThread = new Thread(clusterStatusTopicReceiver); - appThread.start(); - if(log.isInfoEnabled()) { - log.info("Application status message receiver thread started"); + Thread tClusterStatusTopicReceiver = new Thread(clusterStatusTopicReceiver); + tClusterStatusTopicReceiver.start(); + if (log.isDebugEnabled()) { log.debug("Cluster status Receiver thread started"); } http://git-wip-us.apache.org/repos/asf/stratos/blob/fad19f3d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java index eebc077..08d3d28 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java @@ -608,116 +608,7 @@ public class TopologyBuilder { } public static void handleClusterActivatedEvent(ClusterStatusClusterActivatedEvent clusterActivatedEvent) { - Topology topology = TopologyManager.getTopology(); - try { - TopologyManager.acquireWriteLock(); - - if (topology.applicationExists(application.getUniqueIdentifier())) { - log.warn("Application with id [ " + application.getUniqueIdentifier() + " ] already exists in Topology"); - return; - } - List<Cluster> clusters = new ArrayList<Cluster>(); - for (ApplicationClusterContext applicationClusterContext : applicationClusterContexts) { - Cluster cluster = new Cluster(applicationClusterContext.getCartridgeType(), - applicationClusterContext.getClusterId(), applicationClusterContext.getDeploymentPolicyName(), - applicationClusterContext.getAutoscalePolicyName(), application.getUniqueIdentifier()); - //cluster.setStatus(Status.Created); - cluster.addHostName(applicationClusterContext.getHostName()); - cluster.setTenantRange(applicationClusterContext.getTenantRange()); - cluster.setLbCluster(applicationClusterContext.isLbCluster()); - cluster.setKubernetesCluster(applicationClusterContext.isKubernetesCluster()); - cluster.setProperties(CloudControllerUtil.toJavaUtilProperties(applicationClusterContext.getProperties())); - clusters.add(cluster); - - Service service = topology.getService(applicationClusterContext.getCartridgeType()); - if (service != null) { - service.addCluster(cluster); - log.info("Added Cluster " + cluster.toString() + " to Topology for Application with id: " + application.getUniqueIdentifier()); - } else { - log.error("Service " + applicationClusterContext.getCartridgeType() + " not found"); - return; - } - } - - // add to Topology and update - topology.addApplication(application); - TopologyManager.updateTopology(topology); - - log.info("Application with id [ " + application.getUniqueIdentifier() + " ] added to Topology successfully"); - org.apache.stratos.messaging.event.topology.ApplicationCreatedEvent applicationCreatedEvent = new org.apache.stratos.messaging.event.topology.ApplicationCreatedEvent(application, clusters); - TopologyEventPublisher.sendApplicationCreatedEvent(applicationCreatedEvent); - - } finally { - TopologyManager.releaseWriteLock(); - } - } - - public static synchronized void handleApplicationUndeployed(String applicationId) { - - Set<ClusterDataHolder> clusterData; - - // update the Application and Cluster Statuses as 'Terminating' - TopologyManager.acquireWriteLock(); - - try { - - Topology topology = TopologyManager.getTopology(); - - if (!topology.applicationExists(applicationId)) { - log.warn("Application with id [ " + applicationId + " ] doesn't exist in Topology"); - return; - } - - Application application = topology.getApplication(applicationId); - // check and update application status to 'Terminating' - if (!application.isStateTransitionValid(ApplicationStatus.Terminating)) { - log.error("Invalid state transfer from " + application.getStatus() + " to " + ApplicationStatus.Terminating); - } - // for now anyway update the status forcefully - application.setStatus(ApplicationStatus.Terminating); - - // update all the Clusters' statuses to 'Terminating' - clusterData = application.getClusterDataRecursively(); - for (ClusterDataHolder clusterDataHolder : clusterData) { - Service service = topology.getService(clusterDataHolder.getServiceType()); - if (service != null) { - Cluster aCluster = service.getCluster(clusterDataHolder.getClusterId()); - if (aCluster != null) { - // validate state transition - if (!aCluster.isStateTransitionValid(ClusterStatus.Terminating)) { - log.error("Invalid state transfer from " + aCluster.getStatus() + " to " - + ClusterStatus.Terminating); - } - // for now anyway update the status forcefully - aCluster.setStatus(ClusterStatus.Terminating); - - } else { - log.warn("Unable to find Cluster with cluster id " + clusterDataHolder.getClusterId() + - " in Topology"); - } - - } else { - log.warn("Unable to remove cluster with cluster id: " + clusterDataHolder.getClusterId() + " from Topology, " + - " associated Service [ " + clusterDataHolder.getServiceType() + " ] not found"); - } - } - - // update all Group's statuses to 'Terminating' - if (application.getGroups() != null) { - updateGroupStatusesRecursively(GroupStatus.Terminating, application.getGroups()); - } - - TopologyManager.updateTopology(topology); - - } finally { - TopologyManager.releaseWriteLock(); - } - - TopologyEventPublisher.sendApplicationUndeployedEvent(applicationId, clusterData); - } - - public static void handleClusterActivatedEvent(AppStatusClusterActivatedEvent clusterActivatedEvent) { Topology topology = TopologyManager.getTopology(); Service service = topology.getService(clusterActivatedEvent.getServiceName()); //update the status of the cluster http://git-wip-us.apache.org/repos/asf/stratos/blob/fad19f3d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventPublisher.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventPublisher.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventPublisher.java index aff2b6d..c813eef 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventPublisher.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventPublisher.java @@ -1,4 +1,3 @@ -package org.apache.stratos.cloud.controller.topology; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -85,14 +84,6 @@ public class TopologyEventPublisher { } } - public static void sendClusterCreatedEvent(String appId, String serviceName, String clusterId) { - ClusterCreatedEvent clusterCreatedEvent = new ClusterCreatedEvent(appId, serviceName, clusterId); - - if (log.isInfoEnabled()) { - log.info("Publishing cluster created event: " + clusterId); - } - publishEvent(clusterCreatedEvent); - } public static void sendClusterResetEvent(String appId, String serviceName, String clusterId) { ClusterResetEvent clusterResetEvent = new ClusterResetEvent(appId,serviceName, clusterId);
