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:06 UTC
[1/3] git commit: Fixed lb-cluster-id logic in messaging events and
cloud controller
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 <im...@apache.org>
Authored: Mon Dec 23 16:16:40 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
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",
[2/3] git commit: Removed lb-cluster-id from other member related
events and processors
Posted by im...@apache.org.
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",
[3/3] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by im...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/bb170400
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/bb170400
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/bb170400
Branch: refs/heads/master
Commit: bb1704007cca6942c319ce4d1956392228fdb8f0
Parents: e6a2b1c c367a8f
Author: Imesh Gunaratne <im...@apache.org>
Authored: Mon Dec 23 16:20:53 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Dec 23 16:20:53 2013 +0530
----------------------------------------------------------------------
.../internal/AutoscalerServerComponent.java | 2 +-
.../health/HealthEventMessageDelegator.java | 139 ++++---
.../topology/AutoscalerTopologyReceiver.java | 368 +++++++++++++++++
.../topology/AutoscalerTopologyReceiver.java | 401 -------------------
4 files changed, 437 insertions(+), 473 deletions(-)
----------------------------------------------------------------------