Updated Branches: refs/heads/master 0c6acd1c8 -> 70b22f1a3
optimizing SM topology reciever Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/70b22f1a Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/70b22f1a Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/70b22f1a Branch: refs/heads/master Commit: 70b22f1a39a21266376fad027d7731be81425f23 Parents: 0c6acd1 Author: Isuru <[email protected]> Authored: Sun Feb 9 01:04:54 2014 +0530 Committer: Isuru <[email protected]> Committed: Sun Feb 9 01:04:54 2014 +0530 ---------------------------------------------------------------------- .../StratosManagerTopologyReceiver.java | 59 ++++++++------------ 1 file changed, 24 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/70b22f1a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/receiver/StratosManagerTopologyReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/receiver/StratosManagerTopologyReceiver.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/receiver/StratosManagerTopologyReceiver.java index 5f6aea5..7798a4c 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/receiver/StratosManagerTopologyReceiver.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/receiver/StratosManagerTopologyReceiver.java @@ -103,17 +103,15 @@ public class StratosManagerTopologyReceiver implements Runnable { if(cartridgeSubscriptions != null) { - Cluster cluster; + String serviceType = clustercreatedEvent.getServiceName(); //acquire read lock TopologyManager.acquireReadLock(); try { + Cluster cluster = TopologyManager.getTopology().getService(serviceType).getCluster(clustercreatedEvent.getClusterId()); // iterate and do the relevant changes for (CartridgeSubscription cartridgeSubscription : cartridgeSubscriptions) { - //add the information to Topology Cluster Info. model - cluster = TopologyManager.getTopology(). - getService(cartridgeSubscription.getType()).getCluster(cartridgeSubscription.getClusterDomain()); //add the information to Topology Cluster Info. model TopologyClusterInformationModel.getInstance().addCluster(cartridgeSubscription.getSubscriber().getTenantId(), @@ -170,15 +168,14 @@ public class StratosManagerTopologyReceiver implements Runnable { if(cartridgeSubscriptions != null) { - Cluster cluster; + String serviceType = instanceSpawnedEvent.getServiceName(); //acquire read lock TopologyManager.acquireReadLock(); try { - for (CartridgeSubscription cartridgeSubscription : cartridgeSubscriptions) { + Cluster cluster = TopologyManager.getTopology().getService(serviceType).getCluster(clusterDomain); - cluster = TopologyManager.getTopology(). - getService(cartridgeSubscription.getType()).getCluster(cartridgeSubscription.getClusterDomain()); + for (CartridgeSubscription cartridgeSubscription : cartridgeSubscriptions) { TopologyClusterInformationModel.getInstance().addCluster(cartridgeSubscription.getSubscriber().getTenantId(), cartridgeSubscription.getType(), cartridgeSubscription.getAlias(), cluster); @@ -207,15 +204,14 @@ public class StratosManagerTopologyReceiver implements Runnable { if(cartridgeSubscriptions != null) { - Cluster cluster; + String serviceType = memberStartedEvent.getServiceName(); //acquire read lock TopologyManager.acquireReadLock(); try { - for (CartridgeSubscription cartridgeSubscription : cartridgeSubscriptions) { + Cluster cluster = TopologyManager.getTopology().getService(serviceType).getCluster(clusterDomain); - cluster = TopologyManager.getTopology(). - getService(cartridgeSubscription.getType()).getCluster(cartridgeSubscription.getClusterDomain()); + for (CartridgeSubscription cartridgeSubscription : cartridgeSubscriptions) { TopologyClusterInformationModel.getInstance().addCluster(cartridgeSubscription.getSubscriber().getTenantId(), cartridgeSubscription.getType(), cartridgeSubscription.getAlias(), cluster); @@ -244,20 +240,17 @@ public class StratosManagerTopologyReceiver implements Runnable { if(cartridgeSubscriptions != null) { - Cluster cluster; + String serviceType = memberActivatedEvent.getServiceName(); //acquire read lock TopologyManager.acquireReadLock(); try { + Cluster cluster = TopologyManager.getTopology().getService(serviceType).getCluster(clusterDomain); for (CartridgeSubscription cartridgeSubscription : cartridgeSubscriptions) { - cluster = TopologyManager.getTopology(). - getService(cartridgeSubscription.getType()).getCluster(cartridgeSubscription.getClusterDomain()); - TopologyClusterInformationModel.getInstance().addCluster(cartridgeSubscription.getSubscriber().getTenantId(), - cartridgeSubscription.getType(), - cartridgeSubscription.getAlias(), cluster); + cartridgeSubscription.getType(), cartridgeSubscription.getAlias(), cluster); } } finally { @@ -283,17 +276,15 @@ public class StratosManagerTopologyReceiver implements Runnable { if(cartridgeSubscriptions != null) { - Cluster cluster; + String serviceType = memberSuspendedEvent.getServiceName(); //acquire read lock TopologyManager.acquireReadLock(); try { + Cluster cluster = TopologyManager.getTopology().getService(serviceType).getCluster(clusterDomain); for (CartridgeSubscription cartridgeSubscription : cartridgeSubscriptions) { - cluster = TopologyManager.getTopology(). - getService(cartridgeSubscription.getType()).getCluster(cartridgeSubscription.getClusterDomain()); - TopologyClusterInformationModel.getInstance().addCluster(cartridgeSubscription.getSubscriber().getTenantId(), cartridgeSubscription.getType(), cartridgeSubscription.getAlias(), cluster); } @@ -321,26 +312,24 @@ public class StratosManagerTopologyReceiver implements Runnable { if(cartridgeSubscriptions != null) { - Cluster cluster; + String serviceType = memberTerminatedEvent.getServiceName(); //acquire read lock TopologyManager.acquireReadLock(); try { + Cluster cluster = TopologyManager.getTopology().getService(serviceType).getCluster(clusterDomain); + + // remove the terminated member from the cluster + if (cluster.memberExists(memberTerminatedEvent.getMemberId())) { + Member terminatedMember = cluster.getMember(memberTerminatedEvent.getMemberId()); + cluster.removeMember(terminatedMember); + if (log.isDebugEnabled()) { + log.debug("Removed the terminated member with id " + memberTerminatedEvent.getMemberId() + " from the cluster"); + } + } for (CartridgeSubscription cartridgeSubscription : cartridgeSubscriptions) { - cluster = TopologyManager.getTopology(). - getService(cartridgeSubscription.getType()).getCluster(cartridgeSubscription.getClusterDomain()); - - // remove the terminated member from the cluster - if (cluster.memberExists(memberTerminatedEvent.getMemberId())) { - Member terminatedMember = cluster.getMember(memberTerminatedEvent.getMemberId()); - cluster.removeMember(terminatedMember); - if (log.isDebugEnabled()) { - log.debug("Removed the terminated member with id " + memberTerminatedEvent.getMemberId() + " from the cluster"); - } - } - TopologyClusterInformationModel.getInstance().addCluster(cartridgeSubscription.getSubscriber().getTenantId(), cartridgeSubscription.getType(), cartridgeSubscription.getAlias(), cluster); }
