You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2014/12/04 13:31:17 UTC
[6/6] stratos git commit: fixing wrong arguement passing issue
fixing wrong arguement passing issue
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/707f1117
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/707f1117
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/707f1117
Branch: refs/heads/master
Commit: 707f11171a98b3aebdd6ecad221f7220da452e93
Parents: ec3fd0f
Author: reka <rt...@gmail.com>
Authored: Thu Dec 4 18:00:42 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Thu Dec 4 18:00:42 2014 +0530
----------------------------------------------------------------------
.../org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java | 2 +-
.../modules/distribution/src/main/conf/drools/scaling.drl | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/707f1117/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 6c58244..bbe499c 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
@@ -194,8 +194,8 @@ public class RuleTasksDelegator {
CloudControllerClient.getInstance()
.spawnAnInstance(clusterMonitorPartitionContext.getPartition(),
clusterId,
- instanceId,
clusterMonitorPartitionContext.getNetworkPartitionId(),
+ instanceId,
isPrimary,
minimumCountOfNetworkPartition);
if (memberContext != null) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/707f1117/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl b/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
index 8523088..621cbe6 100644
--- a/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
+++ b/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
@@ -132,7 +132,7 @@ dialect "mvel"
int count = 0;
//Calculating the factor scaling
- float factor = numberOfRequiredInstances / clusterInstanceContext.getMinMembers();
+ float factor = numberOfRequiredInstances / clusterInstanceContext.getMinInstanceCount();
delegator.delegateScalingDependencyNotification(clusterId, clusterInstanceContext.getId(), factor);
while(count != additionalInstances){
@@ -146,7 +146,7 @@ dialect "mvel"
}
} else if(scaleDown){
- float factor = numberOfRequiredInstances / clusterInstanceContext.getMinMembers();
+ float factor = numberOfRequiredInstances / clusterInstanceContext.getMinInstanceCount();
delegator.delegateScalingDependencyNotification(clusterId, clusterInstanceContext.getNetworkPartitionId(), factor);
log.debug("[scale-down] Decided to Scale down [cluster] " + clusterId);