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/12/15 04:08:42 UTC

[2/2] stratos git commit: Fix partition availability check at scaling dependents rule

Fix partition availability check at scaling dependents rule


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

Branch: refs/heads/4.1.0-test
Commit: 49a8f1683bd12880b75b581f92c5123fc334c655
Parents: d9c5f38
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Mon Dec 15 08:40:29 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Mon Dec 15 08:40:29 2014 +0530

----------------------------------------------------------------------
 .../distribution/src/main/conf/drools/dependent-scaling.drl      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/49a8f168/products/stratos/modules/distribution/src/main/conf/drools/dependent-scaling.drl
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/drools/dependent-scaling.drl b/products/stratos/modules/distribution/src/main/conf/drools/dependent-scaling.drl
index 41ba475..daafb52 100644
--- a/products/stratos/modules/distribution/src/main/conf/drools/dependent-scaling.drl
+++ b/products/stratos/modules/distribution/src/main/conf/drools/dependent-scaling.drl
@@ -55,7 +55,7 @@ dialect "mvel"
             int count = 0;
             boolean partitionsAvailable = true;
 
-            while(count != additionalInstances){
+            while(count != additionalInstances  && partitionsAvailable){
 
                 ClusterLevelPartitionContext partitionContext =  (ClusterLevelPartitionContext)autoscaleAlgorithm.getNextScaleUpPartitionContext(clusterInstanceContext.getPartitionCtxtsAsAnArray());
                 if(partitionContext != null){
@@ -75,7 +75,7 @@ dialect "mvel"
 
             int count = 0;
 
-            while(count != redundantInstances && partitionsAvailable){
+            while(count != redundantInstances){
                 MemberStatsContext selectedMemberStatsContext = null;
                 double lowestOverallLoad = 0.0;
                 boolean foundAValue = false;