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/01/11 05:22:26 UTC
git commit: Fixing rules log issue
Updated Branches:
refs/heads/master 8a8d3d21f -> 27fb367a5
Fixing rules log issue
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/27fb367a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/27fb367a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/27fb367a
Branch: refs/heads/master
Commit: 27fb367a512bb1653ddcb8fbfb413f06430d2e39
Parents: 8a8d3d2
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sat Jan 11 09:56:50 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sat Jan 11 09:56:50 2014 +0530
----------------------------------------------------------------------
.../stratos/autoscaler/rule/AutoscalerRuleEvaluator.java | 1 -
.../modules/distribution/src/main/conf/scaling.drl | 8 ++++----
2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/27fb367a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java
index 89a7417..21ab342 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java
@@ -94,7 +94,6 @@ public class AutoscalerRuleEvaluator {
if (handle == null) {
ksession.setGlobal("$delegator", new RuleTasksDelegator());
- ksession.setGlobal("log", log);
handle = ksession.insert(obj);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/27fb367a/products/autoscaler/modules/distribution/src/main/conf/scaling.drl
----------------------------------------------------------------------
diff --git a/products/autoscaler/modules/distribution/src/main/conf/scaling.drl b/products/autoscaler/modules/distribution/src/main/conf/scaling.drl
index 193d70b..3e4aded 100644
--- a/products/autoscaler/modules/distribution/src/main/conf/scaling.drl
+++ b/products/autoscaler/modules/distribution/src/main/conf/scaling.drl
@@ -53,7 +53,6 @@ global java.lang.String lbRef;
global java.lang.Boolean rifReset;
global java.lang.Boolean mcReset;
global java.lang.Boolean laReset;
-global org.apache.commons.logging.Log log;
rule "Scaling Rule"
dialect "mvel"
@@ -114,7 +113,7 @@ dialect "mvel"
log.debug("[scaling up] " + " [partition] " + partition.getId() + " [cluster] " + clusterId);
$delegator.delegateSpawn($networkPartitionContext.getPartitionCtxt(partition.getId()), clusterId, lbRef);
}
- } else {
+ } else if(scaleDown){
MemberStatsContext selectedMemberStatsContext = null;
double lowestOverallLoad = 0.0;
@@ -162,9 +161,10 @@ dialect "mvel"
$delegator.delegateTerminate(selectedMemberStatsContext.getMemberId());
}
-
-
}
+ } else{
+ log.debug("[scaling] No decision made to scale up or down ... ");
+
}
end