You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2013/12/14 20:07:17 UTC
[2/5] git commit: changing topology builder due to
ClusterCreatedEvent changes
changing topology builder due to ClusterCreatedEvent changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/151ddd0f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/151ddd0f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/151ddd0f
Branch: refs/heads/master
Commit: 151ddd0f4a3f5c48c8e0a0466aadff645bd26be4
Parents: b061f78
Author: Nirmal Fernando <ni...@apache.org>
Authored: Sun Dec 15 00:33:09 2013 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Sun Dec 15 00:33:09 2013 +0530
----------------------------------------------------------------------
.../controller/impl/CloudControllerServiceImpl.java | 2 +-
.../cloud/controller/topology/TopologyBuilder.java | 12 +++++++-----
.../controller/topology/TopologyEventSender.java | 14 ++++----------
3 files changed, 12 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/151ddd0f/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 99bd59e..a8a1b68 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
@@ -337,7 +337,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
String clusterId = memberContext.getClusterId();
Partition partition = memberContext.getPartition();
- log.info("Starting new instance : " + memberContext.toString());
+ log.info("Received an instance spawn request : " + memberContext.toString());
ComputeService computeService = null;
Template template = null;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/151ddd0f/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 690d435..915c7c2 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
@@ -105,22 +105,24 @@ public class TopologyBuilder {
Service service;
try {
TopologyManager.getInstance().acquireWriteLock();
- service = topology.getService(registrant.getCartridgeType());
+ String cartridgeType = registrant.getCartridgeType();
+ service = topology.getService(cartridgeType);
Properties props = CloudControllerUtil.toJavaUtilProperties(registrant.getProperties());
String property = props.getProperty(Constants.IS_LOAD_BALANCER);
boolean isLb = property != null ? Boolean.parseBoolean(property) : false;
Cluster cluster;
- if (service.clusterExists(registrant.getClusterId())) {
+ String clusterId = registrant.getClusterId();
+ if (service.clusterExists(clusterId)) {
// update the cluster
- cluster = service.getCluster(registrant.getClusterId());
+ cluster = service.getCluster(clusterId);
cluster.addHostName(registrant.getHostName());
cluster.setTenantRange(registrant.getTenantRange());
cluster.setProperties(props);
cluster.setLbCluster(isLb);
} else {
- cluster = new Cluster(registrant.getCartridgeType(), registrant.getClusterId(),
+ cluster = new Cluster(cartridgeType, clusterId,
registrant.getDeploymentPolicyName(), registrant.getAutoScalerPolicyName());
cluster.addHostName(registrant.getHostName());
cluster.setTenantRange(registrant.getTenantRange());
@@ -129,7 +131,7 @@ public class TopologyBuilder {
service.addCluster(cluster);
}
TopologyManager.getInstance().updateTopology(topology);
- TopologyEventSender.sendClusterCreatedEvent(registrant);
+ TopologyEventSender.sendClusterCreatedEvent(cartridgeType, clusterId, cluster);
} finally {
TopologyManager.getInstance().releaseWriteLock();
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/151ddd0f/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventSender.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventSender.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventSender.java
index b6feaa6..8ec21ec 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventSender.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventSender.java
@@ -26,6 +26,7 @@ import org.apache.stratos.cloud.controller.pojo.Registrant;
import org.apache.stratos.cloud.controller.runtime.FasterLookUpDataHolder;
import org.apache.stratos.cloud.controller.util.CloudControllerUtil;
import org.apache.stratos.messaging.broker.publish.EventPublisher;
+import org.apache.stratos.messaging.domain.topology.Cluster;
import org.apache.stratos.messaging.domain.topology.Port;
import org.apache.stratos.messaging.domain.topology.ServiceType;
import org.apache.stratos.messaging.domain.topology.Topology;
@@ -76,18 +77,11 @@ public class TopologyEventSender {
}
}
- public static void sendClusterCreatedEvent(Registrant registrant) {
- Properties props = CloudControllerUtil.toJavaUtilProperties(registrant.getProperties());
- ClusterCreatedEvent clusterCreatedEvent = new ClusterCreatedEvent(registrant.getCartridgeType(),
- registrant.getClusterId(),
- registrant.getHostName());
- clusterCreatedEvent.setTenantRange(registrant.getTenantRange());
- clusterCreatedEvent.setAutoscalingPolicyName(registrant.getAutoScalerPolicyName());
- clusterCreatedEvent.setProperties(props);
- clusterCreatedEvent.setDeploymentPolicyName(registrant.getDeploymentPolicyName());
+ public static void sendClusterCreatedEvent(String serviceName, String clusterId, Cluster cluster) {
+ ClusterCreatedEvent clusterCreatedEvent = new ClusterCreatedEvent(serviceName, clusterId, cluster);
if(log.isInfoEnabled()) {
- log.info("Publishing cluster created event: " +registrant.toString());
+ log.info("Publishing cluster created event: " +cluster.toString());
}
publishEvent(clusterCreatedEvent);