Updated Branches: refs/heads/master c367a8f01 -> bb1704007
Fixed lb-cluster-id logic in messaging events and cloud controller Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/aad81fec Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/aad81fec Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/aad81fec Branch: refs/heads/master Commit: aad81fec35cdb5338d427c394534288467bcdae4 Parents: 43a6f85 Author: Imesh Gunaratne <[email protected]> Authored: Mon Dec 23 16:16:40 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Mon Dec 23 16:16:40 2013 +0530 ---------------------------------------------------------------------- .../controller/topology/TopologyBuilder.java | 2 +- .../topology/TopologyEventSender.java | 6 ++++-- .../event/topology/MemberActivatedEvent.java | 9 --------- .../event/topology/MemberStartedEvent.java | 9 --------- .../MemberActivatedMessageProcessor.java | 21 ++++++++++---------- 5 files changed, 16 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/aad81fec/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 894975a..ba6a49a 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 @@ -188,7 +188,7 @@ public class TopologyBuilder { } finally { TopologyManager.getInstance().releaseWriteLock(); } - TopologyEventSender.sendInstanceSpawnedEvent(serviceName, clusterId, networkPartitionId, partitionId, memberId); + TopologyEventSender.sendInstanceSpawnedEvent(serviceName, clusterId, networkPartitionId, partitionId, memberId, lbClusterId); } public static void handleMemberStarted(InstanceStartedEvent instanceStartedEvent) { http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/aad81fec/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 8ec21ec..060dd00 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 @@ -97,10 +97,12 @@ public class TopologyEventSender { } - public static void sendInstanceSpawnedEvent(String serviceName, String clusterId, String networkPartitionId, String partitionId, String memberId) { + public static void sendInstanceSpawnedEvent(String serviceName, String clusterId, String networkPartitionId, String partitionId, String memberId, String lbClusterId) { InstanceSpawnedEvent instanceSpawnedEvent = new InstanceSpawnedEvent(serviceName, clusterId, networkPartitionId, partitionId, memberId); + instanceSpawnedEvent.setLbClusterId(lbClusterId); if(log.isInfoEnabled()) { - log.info(String.format("Publishing instance spawned event: [service] %s [cluster] %s [network-partition] %s [partition] %s [member] %s", serviceName, clusterId, networkPartitionId, partitionId, memberId)); + log.info(String.format("Publishing instance spawned event: [service] %s [cluster] %s [network-partition] %s [partition] %s [member] %s [lb-cluster-id] %s", + serviceName, clusterId, networkPartitionId, partitionId, memberId, lbClusterId)); } publishEvent(instanceSpawnedEvent); } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/aad81fec/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 a153b2d..3cda807 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 @@ -40,7 +40,6 @@ public class MemberActivatedEvent extends TopologyEvent implements Serializable private final String memberId; private Map<String, Port> portMap; private String memberIp; - private String lbClusterId; public MemberActivatedEvent(String serviceName, String clusterId, String networkPartitionId, String partitionId, String memberId) { this.serviceName = serviceName; @@ -102,12 +101,4 @@ public class MemberActivatedEvent extends TopologyEvent implements Serializable public void setMemberIp(String memberIp) { this.memberIp = memberIp; } - - public String getLbClusterId() { - return lbClusterId; - } - - public void setLbClusterId(String lbClusterId) { - this.lbClusterId = lbClusterId; - } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/aad81fec/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 48037bf..6a89100 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 @@ -36,7 +36,6 @@ public class MemberStartedEvent extends TopologyEvent implements Serializable { private final String memberId; private MemberStatus status; private Properties properties; - private String lbClusterId; public MemberStartedEvent(String serviceName, String clusterId, String networkPartitionId, String partitionId, String memberId) { this.serviceName = serviceName; @@ -78,14 +77,6 @@ public class MemberStartedEvent extends TopologyEvent implements Serializable { return partitionId; } - public String getLbClusterId() { - return lbClusterId; - } - - public void setLbClusterId(String lbClusterId) { - this.lbClusterId = lbClusterId; - } - public String getNetworkPartitionId() { return networkPartitionId; } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/aad81fec/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberActivatedMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberActivatedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberActivatedMessageProcessor.java index 71853d9..a065b70 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberActivatedMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberActivatedMessageProcessor.java @@ -76,16 +76,6 @@ public class MemberActivatedMessageProcessor extends MessageProcessor { } } - // Apply member filter - if(TopologyMemberFilter.getInstance().isActive()) { - if(TopologyMemberFilter.getInstance().lbClusterIdExcluded(event.getLbClusterId())) { - if (log.isDebugEnabled()) { - log.debug(String.format("Member is excluded: [lb-cluster-id] %s", event.getLbClusterId())); - } - return false; - } - } - // Validate event properties if ((event.getMemberIp() == null) || event.getMemberIp().isEmpty()) { throw new RuntimeException(String.format("No ip address found in member activated event: [service] %s [cluster] %s [member] %s", @@ -126,6 +116,17 @@ public class MemberActivatedMessageProcessor extends MessageProcessor { } return false; } + + // Apply member filter + if(TopologyMemberFilter.getInstance().isActive()) { + if(TopologyMemberFilter.getInstance().lbClusterIdExcluded(member.getLbClusterId())) { + if (log.isDebugEnabled()) { + log.debug(String.format("Member is excluded: [lb-cluster-id] %s", member.getLbClusterId())); + } + return false; + } + } + if (member.getStatus() == MemberStatus.Activated) { if (log.isWarnEnabled()) { log.warn(String.format("Member already activated: [service] %s [cluster] %s [member] %s",
