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/23 11:51:07 UTC
[2/3] git commit: Removed lb-cluster-id from other member related
events and processors
Removed lb-cluster-id from other member related events and processors
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/e6a2b1c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/e6a2b1c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/e6a2b1c7
Branch: refs/heads/master
Commit: e6a2b1c7187bc64f1c61191bb94c13204912b0b7
Parents: aad81fe
Author: Imesh Gunaratne <im...@apache.org>
Authored: Mon Dec 23 16:20:29 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Dec 23 16:20:29 2013 +0530
----------------------------------------------------------------------
.../event/topology/MemberSuspendedEvent.java | 9 ---------
.../event/topology/MemberTerminatedEvent.java | 9 ---------
.../topology/MemberStartedMessageProcessor.java | 21 ++++++++++----------
.../MemberSuspendedMessageProcessor.java | 21 ++++++++++----------
.../MemberTerminatedMessageProcessor.java | 21 ++++++++++----------
5 files changed, 33 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e6a2b1c7/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 12f33b0..ed67d4b 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
@@ -32,7 +32,6 @@ public class MemberSuspendedEvent extends TopologyEvent implements Serializable
private final String networkPartitionId;
private final String partitionId;
private final String memberId;
- private String lbClusterId;
public MemberSuspendedEvent(String serviceName, String clusterId, String networkPartitionId, String partitionId, String memberId) {
this.serviceName = serviceName;
@@ -54,14 +53,6 @@ public class MemberSuspendedEvent extends TopologyEvent implements Serializable
return memberId;
}
- 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/e6a2b1c7/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 0368e7a..986b309 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
@@ -33,7 +33,6 @@ public class
private final String networkPartitionId;
private final String partitionId;
private final String memberId;
- private String lbClusterId;
public MemberTerminatedEvent(String serviceName, String clusterId, String networkPartitionId, String partitionId, String memberId) {
this.serviceName = serviceName;
@@ -59,14 +58,6 @@ public class
return memberId;
}
- 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/e6a2b1c7/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberStartedMessageProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberStartedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberStartedMessageProcessor.java
index 2753379..c6eb2a7 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberStartedMessageProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberStartedMessageProcessor.java
@@ -76,16 +76,6 @@ public class MemberStartedMessageProcessor 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 against the existing topology
Service service = topology.getService(event.getServiceName());
if (service == null) {
@@ -113,6 +103,17 @@ public class MemberStartedMessageProcessor 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.Starting) {
if (log.isWarnEnabled()) {
log.warn(String.format("Member already started: [service] %s [cluster] %s [member] %s",
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e6a2b1c7/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberSuspendedMessageProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberSuspendedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberSuspendedMessageProcessor.java
index 1aa7fef..4e3faa9 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberSuspendedMessageProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberSuspendedMessageProcessor.java
@@ -76,16 +76,6 @@ public class MemberSuspendedMessageProcessor 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 against the existing topology
Service service = topology.getService(event.getServiceName());
if (service == null) {
@@ -113,6 +103,17 @@ public class MemberSuspendedMessageProcessor 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.Suspended) {
if (log.isWarnEnabled()) {
log.warn(String.format("Member already suspended: [service] %s [cluster] %s [member] %s",
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e6a2b1c7/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberTerminatedMessageProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberTerminatedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberTerminatedMessageProcessor.java
index c19c3cb..e5ce3d3 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberTerminatedMessageProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberTerminatedMessageProcessor.java
@@ -76,16 +76,6 @@ public class MemberTerminatedMessageProcessor 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 against the existing topology
Service service = topology.getService(event.getServiceName());
if (service == null) {
@@ -112,6 +102,17 @@ public class MemberTerminatedMessageProcessor 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.Terminated) {
if (log.isWarnEnabled()) {
log.warn(String.format("Member already terminated: [service] %s [cluster] %s [member] %s",