meging changes
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1fac161a Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1fac161a Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1fac161a Branch: refs/heads/4.0.0-grouping Commit: 1fac161a2c40f9a294656fed853939a898c59835 Parents: aab7f18 077fb40 Author: reka <[email protected]> Authored: Wed Sep 24 13:31:53 2014 +0530 Committer: reka <[email protected]> Committed: Wed Sep 24 13:31:53 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/grouping/DependencyBuilder.java | 12 ++-- .../stratos/autoscaler/monitor/Monitor.java | 25 ++++---- .../status/checker/StatusChecker.java | 27 +++++---- .../application/ApplicationUtils.java | 7 ++- .../parser/DefaultApplicationParser.java | 55 +++++++++--------- .../controller/pojo/ApplicationDataHolder.java | 59 ------------------- .../controller/pojo/ClusterDataHolder.java | 61 -------------------- .../controller/pojo/payload/MetaDataHolder.java | 5 ++ .../controller/topology/TopologyBuilder.java | 9 ++- .../messaging/domain/topology/Application.java | 34 +++++------ .../domain/topology/ClusterDataHolder.java | 44 ++++++++++++++ .../messaging/domain/topology/Group.java | 22 +++---- .../domain/topology/ParentBehavior.java | 10 +--- .../event/topology/ApplicationCreatedEvent.java | 2 +- 14 files changed, 150 insertions(+), 222 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/1fac161a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/grouping/DependencyBuilder.java ---------------------------------------------------------------------- diff --cc components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/grouping/DependencyBuilder.java index 54b4cf8,4bd47a1..6b43c37 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/grouping/DependencyBuilder.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/grouping/DependencyBuilder.java @@@ -65,11 -66,11 +66,12 @@@ public class DependencyBuilder } } - for(Set<String> clusterIds: component.getServiceNameToClusterIdsMap().values()) { - for (String clusterId : clusterIds) { - if(!startup.contains("cartridge." + clusterId)) { - startup.add("cartridge." + clusterId); - } - Collection<ClusterDataHolder> clusterDataHolders = component.getClusterDataMap().values(); ++ Set<String> cartridgeAliases = component.getClusterDataMap().keySet(); ++ ++ for(String carAlias : cartridgeAliases) { ++ if(!startup.contains("cartridge." + carAlias)) { ++ startup.add("cartridge." + carAlias); + - for(ClusterDataHolder clusterDataHolder : clusterDataHolders) { - if(!startup.contains(clusterDataHolder.getClusterId())) { - startup.add(clusterDataHolder.getClusterId()); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/1fac161a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java ---------------------------------------------------------------------- diff --cc components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java index dfaf720,198074f..9a47600 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java @@@ -29,6 -29,6 +29,7 @@@ import org.apache.stratos.autoscaler.mo import org.apache.stratos.autoscaler.monitor.group.GroupMonitor; import org.apache.stratos.autoscaler.util.AutoscalerUtil; import org.apache.stratos.messaging.domain.topology.Cluster; ++import org.apache.stratos.messaging.domain.topology.ClusterDataHolder; import org.apache.stratos.messaging.domain.topology.ParentBehavior; import org.apache.stratos.messaging.event.Event; import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; @@@ -122,19 -120,19 +123,21 @@@ public abstract class Monitor extends O if(!preOrderTraverse.isEmpty()) { String dependency = preOrderTraverse.poll(); if (dependency.contains("group")) { - startGroupMonitor(this, dependency, component); + startGroupMonitor(this, dependency.substring(6), component); } else if (dependency.contains("cartridge")) { - /*String clusterId = component.findClusterId(dependency.substring(10)); - Cluster cluster = null; - TopologyManager.acquireReadLock(); -- - cluster = TopologyManager.getTopology().getService(dependency).getCluster(clusterId); - TopologyManager.releaseReadLock(); - if (cluster != null) { - startClusterMonitor(cluster); - } else { - //TODO throw exception since Topology is inconsistent - }*/ - String clusterId = component.getClusterData(dependency).getClusterId(); ++ ClusterDataHolder clusterDataHolder = component.getClusterData(dependency.substring(10)); ++ String clusterId = clusterDataHolder.getClusterId(); ++ String serviceName = clusterDataHolder.getServiceType(); + Cluster cluster = null; + TopologyManager.acquireReadLock(); - cluster = TopologyManager.getTopology().getService(dependency).getCluster(clusterId); ++ cluster = TopologyManager.getTopology().getService(serviceName).getCluster(clusterId); + TopologyManager.releaseReadLock(); + if (cluster != null) { + startClusterMonitor(cluster); + } else { + //TODO throw exception since Topology is inconsistent + } ++ } } else { //all the groups/clusters have been started and waiting for activation
