Pass clusterInstanceContext to rules task delegator
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1722d6fb Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1722d6fb Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1722d6fb Branch: refs/heads/master Commit: 1722d6fb967b91ce0aff8b6413c7e83b077faff4 Parents: d66bf8d Author: Lahiru Sandaruwan <[email protected]> Authored: Mon Dec 1 00:55:12 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Mon Dec 1 00:55:12 2014 +0530 ---------------------------------------------------------------------- .../org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/1722d6fb/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 330036a..2582fb8 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 @@ -478,10 +478,9 @@ public class RuleTasksDelegator { return (int) Math.ceil(predictedValue); } - public double getLoadAveragePredictedValue(String instanceId, ClusterLevelNetworkPartitionContext clusterLevelNetworkPartitionContext) { + public double getLoadAveragePredictedValue(ClusterInstanceContext clusterInstanceContext) { double loadAveragePredicted = 0.0d; int totalMemberCount = 0; - ClusterInstanceContext clusterInstanceContext = clusterLevelNetworkPartitionContext.getClusterInstanceContext(instanceId); for (ClusterLevelPartitionContext partitionContext : clusterInstanceContext.getPartitionCtxts().values()) { for (MemberStatsContext memberStatsContext : partitionContext.getMemberStatsContexts().values()) { @@ -506,10 +505,9 @@ public class RuleTasksDelegator { } } - public double getMemoryConsumptionPredictedValue(String instanceId, ClusterLevelNetworkPartitionContext clusterLevelNetworkPartitionContext) { + public double getMemoryConsumptionPredictedValue(ClusterInstanceContext clusterInstanceContext) { double memoryConsumptionPredicted = 0.0d; int totalMemberCount = 0; - ClusterInstanceContext clusterInstanceContext = clusterLevelNetworkPartitionContext.getClusterInstanceContext(instanceId); for (ClusterLevelPartitionContext partitionContext : clusterInstanceContext.getPartitionCtxts().values()) { for (MemberStatsContext memberStatsContext : partitionContext.getMemberStatsContexts().values()) {
