Updated Branches: refs/heads/master 417e18f42 -> 9ac01ebd5
Adding partitions to partition context constructor Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/48f983fd Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/48f983fd Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/48f983fd Branch: refs/heads/master Commit: 48f983fdfe71d74ed10647b851950b8de332ce7d Parents: 09f9165 Author: Lahiru Sandaruwan <[email protected]> Authored: Thu Dec 26 03:23:51 2013 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Thu Dec 26 03:23:51 2013 +0530 ---------------------------------------------------------------------- .../org/apache/stratos/autoscaler/NetworkPartitionContext.java | 3 ++- .../apache/stratos/autoscaler/partition/PartitionManager.java | 4 ++-- .../org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java | 4 ++++ .../java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/48f983fd/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java index 966972e..37b58b3 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java @@ -64,11 +64,12 @@ public class NetworkPartitionContext implements Serializable{ //partitions of this network partition private final Map<String, PartitionContext> partitionCtxts; - public NetworkPartitionContext(String id, String partitionAlgo) { + public NetworkPartitionContext(String id, String partitionAlgo, Partition[] partitions) { super(); this.id = id; this.partitionAlgorithm = partitionAlgo; + this.partitions = partitions; this.setServiceToLBClusterId(new HashMap<String, String>()); this.setClusterIdToLBClusterIdMap(new HashMap<String, String>()); // partitionToMemberCountMap = new HashMap<String, Integer>(); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/48f983fd/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java index 3901502..dc6bda4 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java @@ -123,8 +123,8 @@ private static final Log log = LogFactory.getLog(PartitionManager.class); String id = partitionGroup.getId(); if (!networkPartitionContexts.containsKey(id)) { NetworkPartitionContext networkPartitionContext = - new NetworkPartitionContext( - id, partitionGroup.getPartitionAlgo()); + new NetworkPartitionContext( + id, partitionGroup.getPartitionAlgo(), partitionGroup.getPartitions()); addNetworkPartitionContext(networkPartitionContext); RegistryManager.getInstance().persistNetworkPartition(networkPartitionContext); } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/48f983fd/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 6b727a4..9a1b04e 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 @@ -41,6 +41,10 @@ public class RuleTasksDelegator { } else if(Constants.ONE_AFTER_ANOTHER_ALGORITHM_ID.equals(partitionAlgorithm)){ autoscaleAlgorithm = new OneAfterAnother(); + } else { + if(log.isErrorEnabled()){ + log.error(String.format("Partition algorithm %s could not be identified !", partitionAlgorithm)); + } } return autoscaleAlgorithm; } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/48f983fd/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 d161577..e030156 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 @@ -115,7 +115,7 @@ public class AutoscalerUtil { for (PartitionGroup partitionGroup: deploymentPolicy.getPartitionGroups()){ NetworkPartitionContext networkPartitionContext = new NetworkPartitionContext(partitionGroup.getId(), - partitionGroup.getPartitionAlgo()); + partitionGroup.getPartitionAlgo(), partitionGroup.getPartitions()); for(Partition partition: partitionGroup.getPartitions()){ PartitionContext partitionContext = new PartitionContext(partition);
