Updated Branches: refs/heads/master fb79b0362 -> 787d8b1ca
Added network partition id to member management topology events Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/7ba1a8a1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/7ba1a8a1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/7ba1a8a1 Branch: refs/heads/master Commit: 7ba1a8a1a3fd31f60df358aa83deb421d150f636 Parents: fc51f77 Author: Imesh Gunaratne <[email protected]> Authored: Thu Dec 12 23:29:14 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Thu Dec 12 23:29:14 2013 +0530 ---------------------------------------------------------------------- .../conf/LoadBalancerConfiguration.java | 2 +- .../load/balancer/conf/util/Constants.java | 1 + .../messaging/domain/topology/Member.java | 8 +++++++- .../event/topology/InstanceSpawnedEvent.java | 10 ++++++++-- .../event/topology/MemberActivatedEvent.java | 16 ++++++++++----- .../event/topology/MemberStartedEvent.java | 21 +++++++++----------- .../event/topology/MemberSuspendedEvent.java | 14 ++++++++++++- .../event/topology/MemberTerminatedEvent.java | 11 ++++++++-- .../InstanceSpawnedMessageProcessor.java | 2 +- 9 files changed, 60 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7ba1a8a1/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java index 3827c81..1812fb7 100644 --- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java +++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java @@ -427,7 +427,7 @@ public class LoadBalancerConfiguration { for (Node memberNode : membersNode.getChildNodes()) { String memberId = memberNode.getName(); - Member member = new Member(cluster.getServiceName(), cluster.getClusterId(), Constants.STATIC_PARTITION, memberId); + Member member = new Member(cluster.getServiceName(), cluster.getClusterId(), Constants.STATIC_NETWORK_PARTITION, Constants.STATIC_PARTITION, memberId); String ip = memberNode.getProperty(Constants.CONF_PROPERTY_IP); validateRequiredPropertyInNode(Constants.CONF_PROPERTY_IP, ip, String.format("member %s", memberId)); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7ba1a8a1/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/util/Constants.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/util/Constants.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/util/Constants.java index 4cf22b1..87aed3f 100755 --- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/util/Constants.java +++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/util/Constants.java @@ -59,6 +59,7 @@ public class Constants { public static final String CONF_DELIMITER_HOSTS = ","; public static final long DEFAULT_SESSION_TIMEOUT = 90000; + public static final String STATIC_NETWORK_PARTITION = "static-network-partition"; public static final String STATIC_PARTITION = "static-partition"; /* Nginx format related constants */ http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7ba1a8a1/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java index bb14ae3..061a41c 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java @@ -39,6 +39,7 @@ public class Member implements Serializable { private final String serviceName; private final String clusterId; + private final String networkPartitionId; private final String partitionId; private final String memberId; @@ -50,9 +51,10 @@ public class Member implements Serializable { private Properties properties; private String lbClusterId; - public Member(String serviceName, String clusterId, String partitionId, String memberId) { + public Member(String serviceName, String clusterId, String networkPartitionId, String partitionId, String memberId) { this.serviceName = serviceName; this.clusterId = clusterId; + this.networkPartitionId = networkPartitionId; this.partitionId = partitionId; this.memberId = memberId; this.portMap = new HashMap<String, Port>(); @@ -139,5 +141,9 @@ public class Member implements Serializable { public String getLbClusterId() { return lbClusterId; } + + public String getNetworkPartitionId() { + return networkPartitionId; + } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7ba1a8a1/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/InstanceSpawnedEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/InstanceSpawnedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/InstanceSpawnedEvent.java index db88940..86067dd 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/InstanceSpawnedEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/InstanceSpawnedEvent.java @@ -30,13 +30,15 @@ public class InstanceSpawnedEvent extends TopologyEvent implements Serializable private final String serviceName; private final String clusterId; - private final String memberId; + private final String networkPartitionId; private final String partitionId; + private final String memberId; private String lbClusterId; - public InstanceSpawnedEvent(String serviceName, String clusterId, String partitionId, String memberId) { + public InstanceSpawnedEvent(String serviceName, String clusterId, String networkPartitionId, String partitionId, String memberId) { this.serviceName = serviceName; this.clusterId = clusterId; + this.networkPartitionId = networkPartitionId; this.partitionId = partitionId; this.memberId = memberId; } @@ -49,6 +51,10 @@ public class InstanceSpawnedEvent extends TopologyEvent implements Serializable return clusterId; } + public String getNetworkPartitionId() { + return networkPartitionId; + } + public String getPartitionId() { return partitionId; } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7ba1a8a1/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java index dddd0bd..a153b2d 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java @@ -35,15 +35,17 @@ public class MemberActivatedEvent extends TopologyEvent implements Serializable private final String serviceName; private final String clusterId; + private final String networkPartitionId; private final String partitionId; private final String memberId; private Map<String, Port> portMap; private String memberIp; private String lbClusterId; - public MemberActivatedEvent(String serviceName, String clusterId, String partitionId, String memberId) { + public MemberActivatedEvent(String serviceName, String clusterId, String networkPartitionId, String partitionId, String memberId) { this.serviceName = serviceName; this.clusterId = clusterId; + this.networkPartitionId = networkPartitionId; this.partitionId = partitionId; this.memberId = memberId; this.portMap = new HashMap<String, Port>(); @@ -57,6 +59,14 @@ public class MemberActivatedEvent extends TopologyEvent implements Serializable return clusterId; } + public String getNetworkPartitionId() { + return networkPartitionId; + } + + public String getPartitionId(){ + return this.partitionId; + } + public String getMemberId() { return memberId; } @@ -92,10 +102,6 @@ public class MemberActivatedEvent extends TopologyEvent implements Serializable public void setMemberIp(String memberIp) { this.memberIp = memberIp; } - - public String getPartitionId(){ - return this.partitionId; - } public String getLbClusterId() { return lbClusterId; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7ba1a8a1/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberStartedEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberStartedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberStartedEvent.java index 380a369..48037bf 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberStartedEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberStartedEvent.java @@ -31,15 +31,18 @@ public class MemberStartedEvent extends TopologyEvent implements Serializable { private final String serviceName; private final String clusterId; + private final String networkPartitionId; + private final String partitionId; private final String memberId; private MemberStatus status; private Properties properties; - private String partitionId; private String lbClusterId; - public MemberStartedEvent(String serviceName, String clusterId, String memberId) { + public MemberStartedEvent(String serviceName, String clusterId, String networkPartitionId, String partitionId, String memberId) { this.serviceName = serviceName; this.clusterId = clusterId; + this.networkPartitionId = networkPartitionId; + this.partitionId = partitionId; this.memberId = memberId; } @@ -71,20 +74,10 @@ public class MemberStartedEvent extends TopologyEvent implements Serializable { this.properties = properties; } - /** - * @return the partitionId - */ public String getPartitionId() { return partitionId; } - /** - * @param partitionId the partitionId to set - */ - public void setPartitionId(String partitionId) { - this.partitionId = partitionId; - } - public String getLbClusterId() { return lbClusterId; } @@ -92,4 +85,8 @@ public class MemberStartedEvent extends TopologyEvent implements Serializable { public void setLbClusterId(String lbClusterId) { this.lbClusterId = lbClusterId; } + + public String getNetworkPartitionId() { + return networkPartitionId; + } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7ba1a8a1/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberSuspendedEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberSuspendedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberSuspendedEvent.java index a58d3c7..12f33b0 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberSuspendedEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberSuspendedEvent.java @@ -29,12 +29,16 @@ public class MemberSuspendedEvent extends TopologyEvent implements Serializable private final String serviceName; private final String clusterId; + private final String networkPartitionId; + private final String partitionId; private final String memberId; private String lbClusterId; - public MemberSuspendedEvent(String serviceName, String clusterId, String memberId) { + public MemberSuspendedEvent(String serviceName, String clusterId, String networkPartitionId, String partitionId, String memberId) { this.serviceName = serviceName; this.clusterId = clusterId; + this.networkPartitionId = networkPartitionId; + this.partitionId = partitionId; this.memberId = memberId; } @@ -57,4 +61,12 @@ public class MemberSuspendedEvent extends TopologyEvent implements Serializable public void setLbClusterId(String lbClusterId) { this.lbClusterId = lbClusterId; } + + public String getNetworkPartitionId() { + return networkPartitionId; + } + + public String getPartitionId() { + return partitionId; + } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7ba1a8a1/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 e4ff868..0368e7a 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 @@ -24,18 +24,21 @@ import java.io.Serializable; /** * This event is fired by Cloud Controller when a member is terminated. */ -public class MemberTerminatedEvent extends TopologyEvent implements Serializable { +public class + MemberTerminatedEvent extends TopologyEvent implements Serializable { private static final long serialVersionUID = -7899511757547631157L; private final String serviceName; private final String clusterId; + private final String networkPartitionId; private final String partitionId; private final String memberId; private String lbClusterId; - public MemberTerminatedEvent(String serviceName, String clusterId, String partitionId, String memberId) { + public MemberTerminatedEvent(String serviceName, String clusterId, String networkPartitionId, String partitionId, String memberId) { this.serviceName = serviceName; this.clusterId = clusterId; + this.networkPartitionId = networkPartitionId; this.partitionId = partitionId; this.memberId = memberId; } @@ -63,4 +66,8 @@ public class MemberTerminatedEvent extends TopologyEvent implements Serializable public void setLbClusterId(String lbClusterId) { this.lbClusterId = lbClusterId; } + + public String getNetworkPartitionId() { + return networkPartitionId; + } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7ba1a8a1/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/InstanceSpawnedMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/InstanceSpawnedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/InstanceSpawnedMessageProcessor.java index d362cbc..cd106eb 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/InstanceSpawnedMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/InstanceSpawnedMessageProcessor.java @@ -110,7 +110,7 @@ public class InstanceSpawnedMessageProcessor extends MessageProcessor { } // Apply changes to the topology - Member member = new Member(event.getServiceName(), event.getClusterId(), event.getPartitionId(), event.getMemberId()); + Member member = new Member(event.getServiceName(), event.getClusterId(), event.getNetworkPartitionId(), event.getPartitionId(), event.getMemberId()); member.setStatus(MemberStatus.Created); member.setLbClusterId(event.getLbClusterId()); cluster.addMember(member);
