Repository: stratos Updated Branches: refs/heads/tenant-isolation 5e711969e -> ab79b1a35
Update the missing network partitions uuid Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ab79b1a3 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ab79b1a3 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ab79b1a3 Branch: refs/heads/tenant-isolation Commit: ab79b1a35b8ce47554b43d975160003ee7fb07bd Parents: 5e71196 Author: Gayan Gunarathne <[email protected]> Authored: Fri Jul 24 13:01:14 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Fri Jul 24 13:01:14 2015 +0530 ---------------------------------------------------------------------- .../networkpartition/OneAfterAnotherAlgorithm.java | 4 ++-- .../autoscaler/context/cluster/ClusterContext.java | 2 +- .../autoscaler/internal/AutoscalerServiceComponent.java | 2 +- .../autoscaler/monitor/cluster/ClusterMonitor.java | 10 +++------- .../pojo/policy/deployment/DeploymentPolicy.java | 2 +- .../stratos/autoscaler/rule/RuleTasksDelegator.java | 2 +- .../apache/stratos/autoscaler/util/AutoscalerUtil.java | 2 +- .../topology/ServiceCreatedMessageProcessor.java | 2 +- 8 files changed, 11 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/ab79b1a3/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/OneAfterAnotherAlgorithm.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/OneAfterAnotherAlgorithm.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/OneAfterAnotherAlgorithm.java index e6f71f1..adcb06c 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/OneAfterAnotherAlgorithm.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/OneAfterAnotherAlgorithm.java @@ -131,7 +131,7 @@ public class OneAfterAnotherAlgorithm implements NetworkPartitionAlgorithm { return selectedNetworkPartitions; } - String[] networkPartitions = applicationPolicy.getNetworkPartitions(); + String[] networkPartitions = applicationPolicy.getNetworkPartitionsUuid(); if (networkPartitions == null || networkPartitions.length == 0) { if (log.isWarnEnabled()) { String msg = String.format("Network partitions found in application policy " + @@ -248,7 +248,7 @@ public class OneAfterAnotherAlgorithm implements NetworkPartitionAlgorithm { } else { //Returning the very first network-partition as the default one - String[] networkPartitions = applicationPolicy.getNetworkPartitions(); + String[] networkPartitions = applicationPolicy.getNetworkPartitionsUuid(); selectedNetworkPartitions.add(networkPartitions[0]); } http://git-wip-us.apache.org/repos/asf/stratos/blob/ab79b1a3/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 532f806..1f8971b 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 @@ -204,7 +204,7 @@ public class ClusterContext extends AbstractClusterContext { NetworkPartitionRef networkPartitionRef = null; if (networkPartitions != null && networkPartitions.length != 0) { for (NetworkPartitionRef networkPartition2 : networkPartitions) { - if (networkPartition2.getId().equals( + if (networkPartition2.getUuid().equals( clusterInstance.getNetworkPartitionId())) { networkPartitionRef = networkPartition2; } http://git-wip-us.apache.org/repos/asf/stratos/blob/ab79b1a3/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java index b5fd144..3671762 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java @@ -86,7 +86,7 @@ public class AutoscalerServiceComponent { private ExecutorService executorService; private ScheduledExecutorService scheduler; - protected void activate(ComponentContext componentContext) throws Exception { + protected void activate(ComponentContext componentContext) throws Exception { try { XMLConfiguration conf = ConfUtil.getInstance(AutoscalerConstants.COMPONENTS_CONFIG).getConfiguration(); int threadPoolSize = conf.getInt(AutoscalerConstants.THREAD_POOL_SIZE_KEY, http://git-wip-us.apache.org/repos/asf/stratos/blob/ab79b1a3/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java index 711abf4..d87af95 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java @@ -1356,13 +1356,9 @@ public class ClusterMonitor extends Monitor { } ClusterLevelNetworkPartitionContext networkPartitionContext = null; - try { - networkPartitionContext = - clusterLevelNetworkPartitionContextMap.get( - CloudControllerServiceClient.getInstance().getNetworkPartition(networkPartitionId).getId()); - } catch (RemoteException e) { - log.error("Error while retrieving network partition", e); - } + + networkPartitionContext = clusterLevelNetworkPartitionContextMap.get(networkPartitionId); + if (networkPartitionContext == null) { throw new RuntimeException("Network partition context not found: [network-partition-id] " + networkPartitionId); http://git-wip-us.apache.org/repos/asf/stratos/blob/ab79b1a3/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/DeploymentPolicy.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/DeploymentPolicy.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/DeploymentPolicy.java index 8c33ee7..7d3bae8 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/DeploymentPolicy.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/deployment/DeploymentPolicy.java @@ -79,7 +79,7 @@ public class DeploymentPolicy implements Serializable { public NetworkPartitionRef getNetworkPartitionByNetworkPartitionId(String networkPartitionId) { if (networkPartitionRefs != null) { for (NetworkPartitionRef networkPartition : networkPartitionRefs) { - if (networkPartition.getId().equals(networkPartitionId)) { + if (networkPartition.getUuid().equals(networkPartitionId)) { return networkPartition; } } http://git-wip-us.apache.org/repos/asf/stratos/blob/ab79b1a3/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java index d1a6f72..985de51 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java @@ -187,7 +187,7 @@ public class RuleTasksDelegator { String nwPartitionUuid=null; NetworkPartition[] networkPartitionList= CloudControllerServiceClient.getInstance().getNetworkPartitions(); for(int i=0;i<networkPartitionList.length;i++){ - if(networkPartitionList[i].getId().equals(nwPartitionId)){ + if(networkPartitionList[i].getUuid().equals(nwPartitionId)){ nwPartitionUuid=networkPartitionList[i].getUuid(); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/ab79b1a3/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java index 03fdc14..c31e8a7 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java @@ -134,7 +134,7 @@ public class AutoscalerUtil { try { Topology topology = TopologyManager.getTopology(); if (topology != null) { - Service service = topology.getService(holder.getServiceType()); + Service service = topology.getService(holder.getServiceUuid()); if (service != null) { //If one cluster of the application presents, // then we can assume that all there clusters are there http://git-wip-us.apache.org/repos/asf/stratos/blob/ab79b1a3/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceCreatedMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceCreatedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceCreatedMessageProcessor.java index dc9d040..e3279cd 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceCreatedMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceCreatedMessageProcessor.java @@ -91,7 +91,7 @@ public class ServiceCreatedMessageProcessor extends MessageProcessor { topology.addService(service); if (log.isInfoEnabled()) { - log.info(String.format("Service created: [service] %s", event.getServiceName())); + log.info(String.format("Service created: [service] %s [service-uuid] %s", event.getServiceName(),event.getServiceUuid())); } }
