You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2013/12/18 11:43:09 UTC
[1/2] git commit: Added lb cluster id to member in cloud controller
when instance spawned event received
Updated Branches:
refs/heads/master 148aa4ef2 -> 9cb5bcb9c
Added lb cluster id to member in cloud controller when instance spawned event received
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/cbfe816f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/cbfe816f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/cbfe816f
Branch: refs/heads/master
Commit: cbfe816fe6888dad6450b2212609e2343516fcd8
Parents: 2156741
Author: Imesh Gunaratne <im...@apache.org>
Authored: Wed Dec 18 16:12:45 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Wed Dec 18 16:12:45 2013 +0530
----------------------------------------------------------------------
.../stratos/cloud/controller/impl/CloudControllerServiceImpl.java | 2 +-
.../apache/stratos/cloud/controller/topology/TopologyBuilder.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cbfe816f/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 30bfe9c..3037aac 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
@@ -504,7 +504,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
persist();
// trigger topology
- TopologyBuilder.handleMemberSpawned(memberID, cartridgeType, clusterId, memberContext.getNetworkPartitionId(), partition.getId(), ip);
+ TopologyBuilder.handleMemberSpawned(memberID, cartridgeType, clusterId, memberContext.getNetworkPartitionId(), partition.getId(), ip, memberContext.getLbClusterId());
// update the topology with the newly spawned member
// publish data
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cbfe816f/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 915c7c2..d498f17 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
@@ -163,7 +163,7 @@ public class TopologyBuilder {
}
public static void handleMemberSpawned(String memberId, String serviceName, String clusterId,
- String networkPartitionId, String partitionId, String privateIp) {
+ String networkPartitionId, String partitionId, String privateIp, String lbClusterId) {
//adding the new member to the cluster after it is successfully started in IaaS.
Topology topology = TopologyManager.getInstance().getTopology();
Service service = topology.getService(serviceName);
@@ -178,6 +178,7 @@ public class TopologyBuilder {
Member member = new Member(serviceName, clusterId, networkPartitionId, partitionId, memberId);
member.setStatus(MemberStatus.Created);
member.setMemberIp(privateIp);
+ member.setLbClusterId(lbClusterId);
cluster.addMember(member);
TopologyManager.getInstance().updateTopology(topology);
} finally {
[2/2] git commit: Merge remote-tracking branch 'origin/master'
Posted by im...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/9cb5bcb9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/9cb5bcb9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/9cb5bcb9
Branch: refs/heads/master
Commit: 9cb5bcb9cec4d8bc89dfad6f7ba63293183e32e8
Parents: cbfe816 148aa4e
Author: Imesh Gunaratne <im...@apache.org>
Authored: Wed Dec 18 16:13:01 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Wed Dec 18 16:13:01 2013 +0530
----------------------------------------------------------------------
.../stratos/autoscaler/AutoscalerContext.java | 4 ++++
.../health/HealthEventMessageDelegator.java | 15 +++++++++------
.../stratos/autoscaler/monitor/AbstractMonitor.java | 1 -
.../stratos/autoscaler/TestObsoletedMemberRule.java | 7 +------
.../apache/stratos/cli/RestCommandLineService.java | 12 ++++++------
.../stratos/cli/commands/SubscribeCommand.java | 16 ++++++++--------
6 files changed, 28 insertions(+), 27 deletions(-)
----------------------------------------------------------------------