Repository: stratos Updated Branches: refs/heads/tenant-isolation dddaf6003 -> 44fa444df
Update the application policy missing references with uuid Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/44fa444d Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/44fa444d Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/44fa444d Branch: refs/heads/tenant-isolation Commit: 44fa444dfd610e645fb07001a90beda420dc54ab Parents: dddaf60 Author: Gayan Gunarathne <[email protected]> Authored: Fri Jul 10 07:13:01 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Fri Jul 10 07:13:01 2015 +0530 ---------------------------------------------------------------------- .../dependency/context/ApplicationChildContextFactory.java | 1 + .../dependency/context/ClusterChildContext.java | 9 +++++++++ .../stratos/autoscaler/context/cluster/ClusterContext.java | 2 +- .../apache/stratos/autoscaler/monitor/MonitorFactory.java | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/44fa444d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/context/ApplicationChildContextFactory.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/context/ApplicationChildContextFactory.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/context/ApplicationChildContextFactory.java index 0c8fe9f..3f14e5c 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/context/ApplicationChildContextFactory.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/context/ApplicationChildContextFactory.java @@ -71,6 +71,7 @@ public class ApplicationChildContextFactory { boolean isKillDependent) { ClusterChildContext clusterChildContext = new ClusterChildContext(dataHolder.getClusterId(), isKillDependent); clusterChildContext.setServiceName(dataHolder.getServiceType()); + clusterChildContext.setServiceUuid(dataHolder.getServiceUuid()); return clusterChildContext; } http://git-wip-us.apache.org/repos/asf/stratos/blob/44fa444d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/context/ClusterChildContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/context/ClusterChildContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/context/ClusterChildContext.java index 19f3135..a4464ff 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/context/ClusterChildContext.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/context/ClusterChildContext.java @@ -23,6 +23,7 @@ package org.apache.stratos.autoscaler.applications.dependency.context; */ public class ClusterChildContext extends ApplicationChildContext { private String serviceName; + private String serviceUuid; public ClusterChildContext(String id, boolean killDependent) { super(id, killDependent); @@ -35,4 +36,12 @@ public class ClusterChildContext extends ApplicationChildContext { public void setServiceName(String serviceName) { this.serviceName = serviceName; } + + public String getServiceUuid() { + return serviceUuid; + } + + public void setServiceUuid(String serviceUuid) { + this.serviceUuid = serviceUuid; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/44fa444d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContext.java index c090804..79dcfa0 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContext.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContext.java @@ -185,7 +185,7 @@ public class ClusterContext extends AbstractClusterContext { PartitionRef[] partitions = null; if (networkPartitions != null && networkPartitions.length != 0) { for (NetworkPartitionRef networkPartitionRef : networkPartitions) { - if (networkPartitionRef.getUuid().equals( + if (networkPartitionRef.getId().equals( clusterLevelNetworkPartitionContext.getId())) { partitions = networkPartitionRef.getPartitionRefs(); } http://git-wip-us.apache.org/repos/asf/stratos/blob/44fa444d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorFactory.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorFactory.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorFactory.java index ea04ab9..516cef6 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorFactory.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorFactory.java @@ -215,7 +215,7 @@ public class MonitorFactory { //Retrieving the Cluster from Topology String clusterId = context.getId(); - String serviceName = context.getServiceName(); + String serviceName = context.getServiceUuid(); Cluster cluster; //acquire read lock for the service and cluster TopologyManager.acquireReadLockForCluster(serviceName, clusterId);
