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 2013/10/25 17:09:06 UTC
[1/4] git commit: updating the topology with memeber spawned event
Updated Branches:
refs/heads/master 19edc63b9 -> 1771faf38
updating the topology with memeber spawned event
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/3db7ccc9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/3db7ccc9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/3db7ccc9
Branch: refs/heads/master
Commit: 3db7ccc905d130db9c7dcbe17a7db10658de7e47
Parents: 75cabdc
Author: rekathiru <rt...@gmail.com>
Authored: Fri Oct 25 14:49:05 2013 +0530
Committer: rekathiru <rt...@gmail.com>
Committed: Fri Oct 25 14:49:05 2013 +0530
----------------------------------------------------------------------
.../impl/CloudControllerServiceImpl.java | 2 +-
.../controller/topology/TopologyBuilder.java | 72 ++++++++++----------
2 files changed, 38 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3db7ccc9/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 f3d7bfe..06753a2 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
@@ -332,7 +332,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
String memberID = generateMemberId(clusterId);
//have to add memberID to the payload
serviceCtxt.getPayload().append(",");
- serviceCtxt.getPayload().append(memberID);
+ serviceCtxt.getPayload().append("MEMBER_ID=" + memberID);
//reloading the payload with memberID
reloadPayload(serviceCtxt.getCartridge(), serviceCtxt.generatePayload());
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3db7ccc9/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 c5c7e9c..2990067 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
@@ -76,46 +76,45 @@ public class TopologyBuilder {
public static void handleClusterCreated(List<ServiceContext> serviceContexts) {
Topology topology = TopologyManager.getInstance().getTopology();
Service service;
- for(ServiceContext serviceContext : serviceContexts) {
- service = topology.getService(serviceContext.getCartridgeType());
- if(service == null) {
- service = new Service(serviceContext.getClusterId());
- Cluster cluster = new Cluster(serviceContext.getCartridgeType(),
- serviceContext.getClusterId(),
- serviceContext.getAutoScalerPolicyName());
- cluster.setHostName(serviceContext.getHostName());
- cluster.setTenantRange(serviceContext.getTenantRange());
- cluster.setAutoscalePolicyName(serviceContext.getAutoScalerPolicyName());
- service.addCluster(cluster);
- topology.addService(service);
- } else {
- if (service.clusterExists(serviceContext.getClusterId())) {
- //update the cluster
- service.getCluster(serviceContext.getClusterId()).
- setHostName(serviceContext.getHostName());
- service.getCluster(serviceContext.getClusterId()).
- setAutoscalePolicyName(serviceContext.getAutoScalerPolicyName());
- service.getCluster(serviceContext.getClusterId()).
- setTenantRange(serviceContext.getTenantRange());
- } else {
+ try {
+ TopologyManager.getInstance().acquireWriteLock();
+ for(ServiceContext serviceContext : serviceContexts) {
+ service = topology.getService(serviceContext.getCartridgeType());
+ if(service == null) {
+ service = new Service(serviceContext.getClusterId());
Cluster cluster = new Cluster(serviceContext.getCartridgeType(),
- serviceContext.getClusterId(),
- serviceContext.getAutoScalerPolicyName());
+ serviceContext.getClusterId(),
+ serviceContext.getAutoScalerPolicyName());
cluster.setHostName(serviceContext.getHostName());
cluster.setTenantRange(serviceContext.getTenantRange());
cluster.setAutoscalePolicyName(serviceContext.getAutoScalerPolicyName());
service.addCluster(cluster);
- }
- }
- try {
- TopologyManager.getInstance().acquireWriteLock();
- TopologyManager.getInstance().updateTopology(topology);
- } finally {
- TopologyManager.getInstance().releaseWriteLock();
- }
- TopologyEventSender.sendClusterCreatedEvent(serviceContext);
-
- }
+ topology.addService(service);
+ } else {
+ if (service.clusterExists(serviceContext.getClusterId())) {
+ //update the cluster
+ service.getCluster(serviceContext.getClusterId()).
+ setHostName(serviceContext.getHostName());
+ service.getCluster(serviceContext.getClusterId()).
+ setAutoscalePolicyName(serviceContext.getAutoScalerPolicyName());
+ service.getCluster(serviceContext.getClusterId()).
+ setTenantRange(serviceContext.getTenantRange());
+ } else {
+ Cluster cluster = new Cluster(serviceContext.getCartridgeType(),
+ serviceContext.getClusterId(),
+ serviceContext.getAutoScalerPolicyName());
+ cluster.setHostName(serviceContext.getHostName());
+ cluster.setTenantRange(serviceContext.getTenantRange());
+ cluster.setAutoscalePolicyName(serviceContext.getAutoScalerPolicyName());
+ service.addCluster(cluster);
+ }
+ }
+ TopologyManager.getInstance().updateTopology(topology);
+ TopologyEventSender.sendClusterCreatedEvent(serviceContext);
+ }
+ } finally {
+ TopologyManager.getInstance().releaseWriteLock();
+ }
}
public static void handleClusterRemoved(ServiceContext serviceContext) {
@@ -159,6 +158,9 @@ public class TopologyBuilder {
Member member = new Member(serviceName, clusterId, memberId);
member.setIaasNodeId(iaasNodeId);
member.setStatus(MemberStatus.Created);
+ cluster.addMember(member);
+ cluster.addMemberToIaasNodeId(member);
+ TopologyManager.getInstance().updateTopology(topology);
} finally {
TopologyManager.getInstance().releaseWriteLock();
}
[2/4] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by re...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/cb819ed1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/cb819ed1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/cb819ed1
Branch: refs/heads/master
Commit: cb819ed1ada31aba6c8526b09f0423513b6a413e
Parents: 3db7ccc d50cf4f
Author: rekathiru <rt...@gmail.com>
Authored: Fri Oct 25 19:22:23 2013 +0530
Committer: rekathiru <rt...@gmail.com>
Committed: Fri Oct 25 19:22:23 2013 +0530
----------------------------------------------------------------------
products/cartridge-agent/pom.xml | 5 ++
.../src/main/assembly/assembly.xml | 2 +
.../src/main/bin/cartridge-agent.sh | 50 +++++++++++++++++-
.../stratos/cartridge/agent/CartridgeAgent.java | 53 ++++++++++++++++----
.../stratos/cartridge/agent/EventPublisher.java | 21 ++++++--
.../apache/stratos/cartridge/agent/Main.java | 20 ++++----
.../stratos/cartridge/agent/UserData.java | 30 +++++++++--
.../src/main/resources/jndi.properties | 2 +-
.../src/main/resources/log4j.properties | 2 +-
9 files changed, 152 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
[3/4] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by re...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/ced92fa2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ced92fa2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ced92fa2
Branch: refs/heads/master
Commit: ced92fa2feb5baff0b5e59bf8186534e78af20e6
Parents: cb819ed 19edc63
Author: rekathiru <rt...@gmail.com>
Authored: Fri Oct 25 19:27:42 2013 +0530
Committer: rekathiru <rt...@gmail.com>
Committed: Fri Oct 25 19:27:42 2013 +0530
----------------------------------------------------------------------
.../src/main/bin/export-launch-params.rb | 52 ++++++++++++++++++++
.../src/main/bin/user-data.json.template | 1 +
2 files changed, 53 insertions(+)
----------------------------------------------------------------------
[4/4] git commit: updating the script to get the payload
Posted by re...@apache.org.
updating the script to get the payload
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/1771faf3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/1771faf3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/1771faf3
Branch: refs/heads/master
Commit: 1771faf38d2164201334533d9c9c8168d796008e
Parents: ced92fa
Author: rekathiru <rt...@gmail.com>
Authored: Fri Oct 25 20:38:50 2013 +0530
Committer: rekathiru <rt...@gmail.com>
Committed: Fri Oct 25 20:38:50 2013 +0530
----------------------------------------------------------------------
.../cartridge-agent/src/main/bin/cartridge-agent.sh | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1771faf3/products/cartridge-agent/src/main/bin/cartridge-agent.sh
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/src/main/bin/cartridge-agent.sh b/products/cartridge-agent/src/main/bin/cartridge-agent.sh
index f807169..4b3ee42 100755
--- a/products/cartridge-agent/src/main/bin/cartridge-agent.sh
+++ b/products/cartridge-agent/src/main/bin/cartridge-agent.sh
@@ -29,6 +29,16 @@ fi
echo "Starting cartridge-agent.sh..." | tee -a $LOG
+if [ ! -d ${instance_path}/payload ]; then
+
+ echo "creating payload dir ... " |tee -a $LOG
+ mkdir ${instance_path}/payload
+ echo "payload dir created ... " |tee -a $LOG
+ wget http://169.254.169.254/latest/user-data -O ${instance_path}/payload/user-data.txt
+ echo "payload copied ... " |tee -a $LOG
+fi
+
+
for i in `/usr/bin/ruby export-launch-params.rb`
do
echo "writing user-data parameter $i to user-data.params " | tee -a $LOG
@@ -67,4 +77,4 @@ class_path=${lib_path}commons-io-2.0.jar:${lib_path}andes-client-0.13.wso2v8.jar
json_path=`pwd`/user-data.json
java -cp $class_path org.apache.stratos.cartridge.agent.Main $json_path
-echo "Cartridge Agent started" | tee -a $LOG
\ No newline at end of file
+echo "Cartridge Agent started" | tee -a $LOG