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 15:29:13 UTC
[1/2] git commit: Added member filter to complete topology message
processor
Updated Branches:
refs/heads/master e62bdd774 -> fafe2af40
Added member filter to complete topology message processor
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/958e8dc1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/958e8dc1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/958e8dc1
Branch: refs/heads/master
Commit: 958e8dc13c5298abb0c9a8394fa9305c186c61f8
Parents: e078a11
Author: Imesh Gunaratne <im...@apache.org>
Authored: Wed Dec 11 19:57:57 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Wed Dec 11 19:57:57 2013 +0530
----------------------------------------------------------------------
.../CompleteTopologyMessageProcessor.java | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/958e8dc1/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/CompleteTopologyMessageProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/CompleteTopologyMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/CompleteTopologyMessageProcessor.java
index 3fa8890..3c88df9 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/CompleteTopologyMessageProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/CompleteTopologyMessageProcessor.java
@@ -21,10 +21,12 @@ package org.apache.stratos.messaging.message.processor.topology;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.messaging.domain.topology.Cluster;
+import org.apache.stratos.messaging.domain.topology.Member;
import org.apache.stratos.messaging.domain.topology.Service;
import org.apache.stratos.messaging.domain.topology.Topology;
import org.apache.stratos.messaging.event.topology.CompleteTopologyEvent;
import org.apache.stratos.messaging.message.filter.topology.TopologyClusterFilter;
+import org.apache.stratos.messaging.message.filter.topology.TopologyMemberFilter;
import org.apache.stratos.messaging.message.filter.topology.TopologyServiceFilter;
import org.apache.stratos.messaging.message.processor.MessageProcessor;
import org.apache.stratos.messaging.util.Util;
@@ -83,6 +85,22 @@ public class CompleteTopologyMessageProcessor extends MessageProcessor {
}
}
+ // Apply member filter
+ if (TopologyMemberFilter.getInstance().isActive()) {
+ for (Service service : topology.getServices()) {
+ for (Cluster cluster : service.getClusters()) {
+ for(Member member : cluster.getMembers()) {
+ if(TopologyMemberFilter.getInstance().lbClusterIdExcluded(member.getLbClusterId())) {
+ if (log.isDebugEnabled()) {
+ log.debug(String.format("Member is excluded: [member] %s [lb-cluster-id] %s", member.getMemberId(), member.getLbClusterId()));
+ }
+ cluster.removeMember(member);
+ }
+ }
+ }
+ }
+ }
+
if (log.isInfoEnabled()) {
log.info("Topology initialized");
}
[2/2] git commit: Merge remote-tracking branch 'origin/master'
Posted by im...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/fafe2af4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/fafe2af4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/fafe2af4
Branch: refs/heads/master
Commit: fafe2af40a02e0fc64e880ab72fcc5552499d5c2
Parents: 958e8dc e62bdd7
Author: Imesh Gunaratne <im...@apache.org>
Authored: Wed Dec 11 19:58:13 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Wed Dec 11 19:58:13 2013 +0530
----------------------------------------------------------------------
.../manager/CartridgeSubscriptionManager.java | 127 +++++++++++++------
.../ApplicationCartridgeSubscription.java | 2 +
.../impl/CloudControllerServiceImpl.java | 12 +-
.../controller/topology/TopologyBuilder.java | 4 +-
.../util/CloudControllerConstants.java | 1 -
.../stratos/messaging/util/Constants.java | 3 +
.../apache/stratos/rest/endpoint/Constants.java | 1 -
.../rest/endpoint/services/ServiceUtils.java | 22 ++--
8 files changed, 117 insertions(+), 55 deletions(-)
----------------------------------------------------------------------