You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2014/11/04 06:29:41 UTC
[03/20] git commit: CC api changes to create app cluster objects
CC api changes to create app cluster objects
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b141bc3c
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b141bc3c
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b141bc3c
Branch: refs/heads/docker-grouping-merge
Commit: b141bc3cc97ea9d2ab015c69782b048e0df9b158
Parents: 3841007
Author: Isuru Haththotuwa <is...@apache.org>
Authored: Mon Nov 3 12:56:16 2014 +0530
Committer: Isuru Haththotuwa <is...@apache.org>
Committed: Mon Nov 3 12:56:30 2014 +0530
----------------------------------------------------------------------
.../impl/CloudControllerServiceImpl.java | 15 ++++-
.../interfaces/CloudControllerService.java | 9 ++-
.../controller/topology/TopologyBuilder.java | 24 ++++++-
.../topology/TopologyEventPublisher.java | 9 +++
...licationClustersCreatedMessageProcessor.java | 4 +-
.../main/resources/CloudControllerService.wsdl | 66 ++++++++++++++++++++
6 files changed, 122 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/b141bc3c/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 19c87f8..e9a4852 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
@@ -39,6 +39,7 @@ import org.apache.stratos.cloud.controller.topology.TopologyBuilder;
import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
import org.apache.stratos.cloud.controller.util.CloudControllerUtil;
import org.apache.stratos.cloud.controller.validate.interfaces.PartitionValidator;
+import org.apache.stratos.messaging.domain.topology.Cluster;
import org.apache.stratos.messaging.domain.topology.MemberStatus;
import org.apache.stratos.messaging.util.Constants;
import org.jclouds.compute.ComputeService;
@@ -1388,7 +1389,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
}
@Override
- public void registerApplicationClusters(ApplicationClusterContextDTO[] appClustersContexts) throws
+ public void createApplicationClusters(String appId, ApplicationClusterContextDTO[] appClustersContexts) throws
ApplicationClusterRegistrationException {
// Create a Cluster Context obj. for each of the Clusters in the Application
@@ -1398,12 +1399,24 @@ public class CloudControllerServiceImpl implements CloudControllerService {
throw new ApplicationClusterRegistrationException(errorMsg);
}
+ List<Cluster> clusters = new ArrayList<Cluster>();
+
for (ApplicationClusterContextDTO appClusterCtxt : appClustersContexts) {
+ // add the context data
dataHolder.addClusterContext(new ClusterContext(appClusterCtxt.getClusterId(),
appClusterCtxt.getCartridgeType(), appClusterCtxt.getTextPayload(),
appClusterCtxt.getHostName(), appClusterCtxt.isLbCluster()));
+ // create Cluster objects
+ Cluster newCluster = new Cluster(appClusterCtxt.getCartridgeType(), appClusterCtxt.getClusterId(),
+ appClusterCtxt.getDeploymentPolicyName(), appClusterCtxt.getAutoscalePolicyName(), appId);
+ newCluster.setLbCluster(false);
+ newCluster.setTenantRange("*");
+ newCluster.setHostNames(Arrays.asList(appClusterCtxt.getHostName()));
+ clusters.add(newCluster);
}
+ TopologyBuilder.handleApplicationClustersCreated(appId, clusters);
+
persist();
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/b141bc3c/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java
index e9f526a..86899b3 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java
@@ -167,6 +167,13 @@ public interface CloudControllerService {
*/
public ClusterContext getClusterContext (String clusterId);
- public void registerApplicationClusters (ApplicationClusterContextDTO [] appClustersContexts) throws
+ /**
+ * Creates the clusters relevant to an application in the topology model
+ *
+ * @param appId application id
+ * @param appClustersContexts cluster information holder object
+ * @throws ApplicationClusterRegistrationException if the cluster information are null/empty
+ */
+ public void createApplicationClusters(String appId, ApplicationClusterContextDTO[] appClustersContexts) throws
ApplicationClusterRegistrationException;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/b141bc3c/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 2d5d181..6360d61 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
@@ -147,9 +147,31 @@ public class TopologyBuilder {
TopologyEventPublisher.sendClusterCreatedEvent(cluster);
}
- public static void handleApplicationClustersRegisterd () {
+ public static void handleApplicationClustersCreated(String appId, List<Cluster> appClusters) {
+ TopologyManager.acquireWriteLock();
+
+ try {
+ Topology topology = TopologyManager.getTopology();
+
+ for (Cluster cluster : appClusters) {
+ Service service = topology.getService(cluster.getServiceName());
+ if (service == null) {
+ log.error("Service " + cluster.getServiceName()
+ + " not found in Topology, unable to create Application cluster");
+ } else {
+ service.addCluster(cluster);
+ log.info("Application Cluster " + cluster.getClusterId() + " created in CC topology");
+ }
+ }
+
+ TopologyManager.updateTopology(topology);
+
+ } finally {
+ TopologyManager.releaseWriteLock();
+ }
+ TopologyEventPublisher.sendApplicationClustersCreated(appId, appClusters);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/b141bc3c/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 3f58080..b855b7f 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
@@ -113,6 +113,15 @@ public class TopologyEventPublisher {
publishEvent(new ApplicationUndeployedEvent(applicationId, clusterData));
}
+ public static void sendApplicationClustersCreated(String appId, List<Cluster> clusters) {
+
+ if (log.isInfoEnabled()) {
+ log.info("Publishing Application Clusters registered event for Application: " + appId);
+ }
+
+ publishEvent(new ApplicationClustersCreatedEvent(clusters, appId));
+ }
+
// public static void sendApplicationRemovedEvent(String applicationId, Set<ClusterDataHolder> clusterData,
// int tenantId, String tenantDomain) {
//
http://git-wip-us.apache.org/repos/asf/stratos/blob/b141bc3c/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationClustersCreatedMessageProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationClustersCreatedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationClustersCreatedMessageProcessor.java
index 3780db5..58d54d8 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationClustersCreatedMessageProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationClustersCreatedMessageProcessor.java
@@ -77,7 +77,7 @@ public class ApplicationClustersCreatedMessageProcessor extends MessageProcessor
for(Cluster cluster : clusters) {
String serviceName = cluster.getServiceName();
String clusterId = cluster.getClusterId();
- TopologyUpdater.acquireWriteLockForCluster(clusterId, serviceName);
+ TopologyUpdater.acquireWriteLockForService(serviceName);
try {
// Apply service filter
@@ -128,7 +128,7 @@ public class ApplicationClustersCreatedMessageProcessor extends MessageProcessor
}
}
} finally {
- TopologyUpdater.releaseWriteLockForCluster(clusterId, serviceName);
+ TopologyUpdater.releaseWriteLockForService(serviceName);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/b141bc3c/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl b/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl
index 696060a..316ad85 100644
--- a/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl
+++ b/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl
@@ -47,6 +47,11 @@
<xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
+ <xs:complexType name="ApplicationClusterRegistrationException">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="message" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
</xs:schema>
<xs:schema xmlns:ax229="http://pojo.controller.cloud.stratos.apache.org/xsd" xmlns:ax227="http://partition.deployment.controller.cloud.stratos.apache.org/xsd" xmlns:ax223="http://exception.controller.cloud.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://impl.controller.cloud.stratos.apache.org">
<xs:import namespace="http://exception.controller.cloud.stratos.apache.org/xsd"></xs:import>
@@ -317,6 +322,21 @@
</xs:sequence>
</xs:complexType>
</xs:element>
+ <xs:element name="CloudControllerServiceApplicationClusterRegistrationException">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="ApplicationClusterRegistrationException" nillable="true" type="ax222:ApplicationClusterRegistrationException"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="createApplicationClusters">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="appId" nillable="true" type="xs:string"></xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="appClustersContexts" nillable="true" type="ax225:ApplicationClusterContextDTO"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:schema>
<xs:schema xmlns:ax228="http://partition.deployment.controller.cloud.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://pojo.controller.cloud.stratos.apache.org/xsd">
<xs:import namespace="http://partition.deployment.controller.cloud.stratos.apache.org/xsd"></xs:import>
@@ -494,6 +514,18 @@
<xs:element minOccurs="0" name="portUuid" nillable="true" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
+ <xs:complexType name="ApplicationClusterContextDTO">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="autoscalePolicyName" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="cartridgeType" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="clusterId" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="deploymentPolicyName" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="lbCluster" type="xs:boolean"></xs:element>
+ <xs:element minOccurs="0" name="tenantRange" nillable="true" type="xs:string"></xs:element>
+ <xs:element minOccurs="0" name="textPayload" nillable="true" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
</xs:schema>
<xs:schema xmlns:ax226="http://pojo.controller.cloud.stratos.apache.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://partition.deployment.controller.cloud.stratos.apache.org/xsd">
<xs:import namespace="http://pojo.controller.cloud.stratos.apache.org/xsd"></xs:import>
@@ -517,6 +549,12 @@
<wsdl:message name="CloudControllerServiceInvalidPartitionException">
<wsdl:part name="parameters" element="ns:CloudControllerServiceInvalidPartitionException"></wsdl:part>
</wsdl:message>
+ <wsdl:message name="createApplicationClustersRequest">
+ <wsdl:part name="parameters" element="ns:createApplicationClusters"></wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="CloudControllerServiceApplicationClusterRegistrationException">
+ <wsdl:part name="parameters" element="ns:CloudControllerServiceApplicationClusterRegistrationException"></wsdl:part>
+ </wsdl:message>
<wsdl:message name="validateDeploymentPolicyRequest">
<wsdl:part name="parameters" element="ns:validateDeploymentPolicy"></wsdl:part>
</wsdl:message>
@@ -628,6 +666,10 @@
<wsdl:output message="ns:validatePartitionResponse" wsaw:Action="urn:validatePartitionResponse"></wsdl:output>
<wsdl:fault message="ns:CloudControllerServiceInvalidPartitionException" name="CloudControllerServiceInvalidPartitionException" wsaw:Action="urn:validatePartitionCloudControllerServiceInvalidPartitionException"></wsdl:fault>
</wsdl:operation>
+ <wsdl:operation name="createApplicationClusters">
+ <wsdl:input message="ns:createApplicationClustersRequest" wsaw:Action="urn:createApplicationClusters"></wsdl:input>
+ <wsdl:fault message="ns:CloudControllerServiceApplicationClusterRegistrationException" name="CloudControllerServiceApplicationClusterRegistrationException" wsaw:Action="urn:createApplicationClustersCloudControllerServiceApplicationClusterRegistrationException"></wsdl:fault>
+ </wsdl:operation>
<wsdl:operation name="validateDeploymentPolicy">
<wsdl:input message="ns:validateDeploymentPolicyRequest" wsaw:Action="urn:validateDeploymentPolicy"></wsdl:input>
<wsdl:output message="ns:validateDeploymentPolicyResponse" wsaw:Action="urn:validateDeploymentPolicyResponse"></wsdl:output>
@@ -711,6 +753,15 @@
</wsdl:portType>
<wsdl:binding name="CloudControllerServiceSoap11Binding" type="ns:CloudControllerServicePortType">
<soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"></soap:binding>
+ <wsdl:operation name="createApplicationClusters">
+ <soap:operation soapAction="urn:createApplicationClusters" style="document"></soap:operation>
+ <wsdl:input>
+ <soap:body use="literal"></soap:body>
+ </wsdl:input>
+ <wsdl:fault name="CloudControllerServiceApplicationClusterRegistrationException">
+ <soap:fault use="literal" name="CloudControllerServiceApplicationClusterRegistrationException"></soap:fault>
+ </wsdl:fault>
+ </wsdl:operation>
<wsdl:operation name="validatePartition">
<soap:operation soapAction="urn:validatePartition" style="document"></soap:operation>
<wsdl:input>
@@ -915,6 +966,15 @@
</wsdl:binding>
<wsdl:binding name="CloudControllerServiceSoap12Binding" type="ns:CloudControllerServicePortType">
<soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"></soap12:binding>
+ <wsdl:operation name="createApplicationClusters">
+ <soap12:operation soapAction="urn:createApplicationClusters" style="document"></soap12:operation>
+ <wsdl:input>
+ <soap12:body use="literal"></soap12:body>
+ </wsdl:input>
+ <wsdl:fault name="CloudControllerServiceApplicationClusterRegistrationException">
+ <soap12:fault use="literal" name="CloudControllerServiceApplicationClusterRegistrationException"></soap12:fault>
+ </wsdl:fault>
+ </wsdl:operation>
<wsdl:operation name="validatePartition">
<soap12:operation soapAction="urn:validatePartition" style="document"></soap12:operation>
<wsdl:input>
@@ -1119,6 +1179,12 @@
</wsdl:binding>
<wsdl:binding name="CloudControllerServiceHttpBinding" type="ns:CloudControllerServicePortType">
<http:binding verb="POST"></http:binding>
+ <wsdl:operation name="createApplicationClusters">
+ <http:operation location="createApplicationClusters"></http:operation>
+ <wsdl:input>
+ <mime:content type="text/xml" part="parameters"></mime:content>
+ </wsdl:input>
+ </wsdl:operation>
<wsdl:operation name="validatePartition">
<http:operation location="validatePartition"></http:operation>
<wsdl:input>