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/11 14:29:07 UTC
git commit: Added partition id to the member terminated event
Updated Branches:
refs/heads/master 3483dec7e -> 6d2d3eba4
Added partition id to the member terminated 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/6d2d3eba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/6d2d3eba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/6d2d3eba
Branch: refs/heads/master
Commit: 6d2d3eba451160a8b1787a41c0a19370aedbd501
Parents: 3483dec
Author: Imesh Gunaratne <im...@apache.org>
Authored: Wed Dec 11 18:58:58 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Wed Dec 11 18:58:58 2013 +0530
----------------------------------------------------------------------
.../cloud/controller/impl/CloudControllerServiceImpl.java | 2 +-
.../stratos/cloud/controller/topology/TopologyBuilder.java | 4 ++--
.../cloud/controller/topology/TopologyEventSender.java | 8 +++-----
.../messaging/event/topology/MemberTerminatedEvent.java | 8 +++++++-
4 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6d2d3eba/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 a9afac2..6dfbab8 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
@@ -916,7 +916,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
// serviceCtxt.setProperty(ipProp, newIpStr.length() == 0 ? "" : newIpStr
// .substring(0, newIpStr.length() - 1).toString());
//updating the topology
- TopologyBuilder.handleMemberTerminated(ctxt.getCartridgeType(), ctxt.getClusterId(), ctxt.getMemberId());
+ TopologyBuilder.handleMemberTerminated(ctxt.getCartridgeType(), ctxt.getClusterId(), ctxt.getPartition().getId(), ctxt.getMemberId());
// remove the reference
// ctxt.removeNodeIdToPublicIp(nodeId);
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6d2d3eba/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 fb1fe5a..cb0d676 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
@@ -283,7 +283,7 @@ public class TopologyBuilder {
TopologyEventSender.sendMemberActivatedEvent(memberActivatedEvent);
}
- public static void handleMemberTerminated(String serviceName, String clusterId, String memberId) {
+ public static void handleMemberTerminated(String serviceName, String clusterId, String partitionId, String memberId) {
Topology topology = TopologyManager.getInstance().getTopology();
Service service = topology.getService(serviceName);
Cluster cluster = service.getCluster(clusterId);
@@ -301,7 +301,7 @@ public class TopologyBuilder {
} finally {
TopologyManager.getInstance().releaseWriteLock();
}
- TopologyEventSender.sendMemberTerminatedEvent(serviceName, clusterId, memberId);
+ TopologyEventSender.sendMemberTerminatedEvent(serviceName, clusterId, partitionId, memberId);
}
public static void handleMemberSuspended() {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6d2d3eba/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 8b8137c..969a1f1 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
@@ -132,12 +132,10 @@ public class TopologyEventSender {
publishEvent(memberActivatedEvent);
}
- public static void sendMemberTerminatedEvent(String serviceName, String clusterId, String memberId) {
- MemberTerminatedEvent memberTerminatedEvent = new MemberTerminatedEvent(serviceName,
- clusterId,
- memberId);
+ public static void sendMemberTerminatedEvent(String serviceName, String clusterId, String partitionId, String memberId) {
+ MemberTerminatedEvent memberTerminatedEvent = new MemberTerminatedEvent(serviceName, clusterId, partitionId, memberId);
if(log.isInfoEnabled()) {
- log.info(String.format("Publishing member terminated event: [service] %s [cluster] %s [member] %s", serviceName, clusterId, memberId));
+ log.info(String.format("Publishing member terminated event: [service] %s [cluster] %s [partition] %s [member] %s", serviceName, clusterId, partitionId, memberId));
}
publishEvent(memberTerminatedEvent);
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6d2d3eba/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberTerminatedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberTerminatedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberTerminatedEvent.java
index 8a50b0b..e4ff868 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberTerminatedEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberTerminatedEvent.java
@@ -29,12 +29,14 @@ public class MemberTerminatedEvent extends TopologyEvent implements Serializable
private final String serviceName;
private final String clusterId;
+ private final String partitionId;
private final String memberId;
private String lbClusterId;
- public MemberTerminatedEvent(String serviceName, String clusterId, String memberId) {
+ public MemberTerminatedEvent(String serviceName, String clusterId, String partitionId, String memberId) {
this.serviceName = serviceName;
this.clusterId = clusterId;
+ this.partitionId = partitionId;
this.memberId = memberId;
}
@@ -46,6 +48,10 @@ public class MemberTerminatedEvent extends TopologyEvent implements Serializable
return clusterId;
}
+ public String getPartitionId() {
+ return partitionId;
+ }
+
public String getMemberId() {
return memberId;
}