You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2014/11/18 09:50:14 UTC

stratos git commit: Introducing required count based on dependencies and stats

Repository: stratos
Updated Branches:
  refs/heads/master cbc1105cc -> b4e456965


Introducing required count based on dependencies and stats


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b4e45696
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b4e45696
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b4e45696

Branch: refs/heads/master
Commit: b4e456965ea2da0b701b621a941e061cc2c03f80
Parents: cbc1105
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Tue Nov 18 14:21:21 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Tue Nov 18 14:21:21 2014 +0530

----------------------------------------------------------------------
 .../autoscaler/NetworkPartitionContext.java     | 22 ++++++++++++++------
 .../cluster/VMServiceClusterMonitor.java        |  3 +--
 2 files changed, 17 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/b4e45696/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 7ebb42e..cadca37 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
@@ -44,7 +44,8 @@ public class NetworkPartitionContext implements Serializable{
     private float requestsServedPerInstance;
 
     private int minInstanceCount = 0, maxInstanceCount = 0;
-    private int requiredInstanceCount;
+    private int requiredInstanceCountBasedOnStats;
+    private int requiredInstanceCountBasedOnDependencies;
 
 
     private final String partitionAlgorithm;
@@ -91,7 +92,8 @@ public class NetworkPartitionContext implements Serializable{
             minInstanceCount += partition.getPartitionMin();
             maxInstanceCount += partition.getPartitionMax();
         }
-        requiredInstanceCount = minInstanceCount;
+        requiredInstanceCountBasedOnStats = minInstanceCount;
+        requiredInstanceCountBasedOnDependencies = minInstanceCount;
 
     }
 
@@ -402,11 +404,19 @@ public class NetworkPartitionContext implements Serializable{
         this.scaleDownRequestsCount += 1;
     }
 
-    public float getRequiredInstanceCount() {
-        return requiredInstanceCount;
+    public float getRequiredInstanceCountBasedOnStats() {
+        return requiredInstanceCountBasedOnStats;
     }
 
-    public void setRequiredInstanceCount(int requiredInstanceCount) {
-        this.requiredInstanceCount = requiredInstanceCount;
+    public void setRequiredInstanceCountBasedOnStats(int requiredInstanceCountBasedOnStats) {
+        this.requiredInstanceCountBasedOnStats = requiredInstanceCountBasedOnStats;
+    }
+
+    public int getRequiredInstanceCountBasedOnDependencies() {
+        return requiredInstanceCountBasedOnDependencies;
+    }
+
+    public void setRequiredInstanceCountBasedOnDependencies(int requiredInstanceCountBasedOnDependencies) {
+        this.requiredInstanceCountBasedOnDependencies = requiredInstanceCountBasedOnDependencies;
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/b4e45696/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMServiceClusterMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMServiceClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMServiceClusterMonitor.java
index 9992b67..2a04813 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMServiceClusterMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMServiceClusterMonitor.java
@@ -27,7 +27,6 @@ import org.apache.stratos.autoscaler.VMClusterContext;
 import org.apache.stratos.autoscaler.VMServiceClusterContext;
 import org.apache.stratos.autoscaler.event.publisher.ClusterStatusEventPublisher;
 import org.apache.stratos.autoscaler.monitor.MonitorStatusEventBuilder;
-import org.apache.stratos.autoscaler.monitor.events.ClusterScalingEvent;
 import org.apache.stratos.autoscaler.monitor.events.MonitorScalingEvent;
 import org.apache.stratos.autoscaler.monitor.events.MonitorStatusEvent;
 import org.apache.stratos.autoscaler.rule.AutoscalerRuleEvaluator;
@@ -271,7 +270,7 @@ public class VMServiceClusterMonitor extends VMClusterMonitor {
 
             float requiredInstanceCount = networkPartitionContext.getMinInstanceCount() * scalingFactorBasedOnDependencies;
             int roundedRequiredInstanceCount = getRoundedInstanceCount(requiredInstanceCount, 0);
-            networkPartitionContext.setRequiredInstanceCount(roundedRequiredInstanceCount);
+            networkPartitionContext.setRequiredInstanceCountBasedOnStats(roundedRequiredInstanceCount);
             //TODO get instance count rounding fraction(0) as a part of Autoscaling policy
         }
     }