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/26 19:18:46 UTC
stratos git commit: Fixing test failure in Autoscaler component
Repository: stratos
Updated Branches:
refs/heads/master e49128f84 -> a52de72cd
Fixing test failure in Autoscaler component
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a52de72c
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a52de72c
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a52de72c
Branch: refs/heads/master
Commit: a52de72cd9f7802f54acbcb5583823d3f1be4f3d
Parents: e49128f
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Wed Nov 26 23:50:00 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Wed Nov 26 23:50:00 2014 +0530
----------------------------------------------------------------------
.../autoscaler/monitor/cluster/VMServiceClusterMonitor.java | 6 ++++++
.../modules/distribution/src/main/conf/drools/mincheck.drl | 3 ++-
.../modules/distribution/src/main/conf/drools/scaling.drl | 3 ++-
3 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/a52de72c/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 2f83e17..7ea2f50 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
@@ -143,6 +143,8 @@ public class VMServiceClusterMonitor extends VMClusterMonitor {
getMinCheckKnowledgeSession().setGlobal("lbRef", lbReferenceType);
getMinCheckKnowledgeSession().setGlobal("isPrimary", hasPrimary);
+ getMinCheckKnowledgeSession().setGlobal("instanceId", "instanceId");
+ //TODO pass correct instance id
if (log.isDebugEnabled()) {
log.debug(String.format("Running minimum check for partition %s ", partitionContext.getPartitionId()));
@@ -168,7 +170,11 @@ public class VMServiceClusterMonitor extends VMClusterMonitor {
}
if (rifReset || memoryConsumptionReset || loadAverageReset) {
+
VMClusterContext vmClusterContext = (VMClusterContext) instanceIdToClusterCtxtEntry.getValue();
+
+ getScaleCheckKnowledgeSession().setGlobal("instanceId", "instanceId");
+ //TODO pass correct instance id
getScaleCheckKnowledgeSession().setGlobal("clusterId", getClusterId());
getScaleCheckKnowledgeSession().setGlobal("autoscalePolicy", vmClusterContext.getAutoscalePolicy());
getScaleCheckKnowledgeSession().setGlobal("rifReset", rifReset);
http://git-wip-us.apache.org/repos/asf/stratos/blob/a52de72c/products/stratos/modules/distribution/src/main/conf/drools/mincheck.drl
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/drools/mincheck.drl b/products/stratos/modules/distribution/src/main/conf/drools/mincheck.drl
index bcb272b..8ff3bc1 100755
--- a/products/stratos/modules/distribution/src/main/conf/drools/mincheck.drl
+++ b/products/stratos/modules/distribution/src/main/conf/drools/mincheck.drl
@@ -47,6 +47,7 @@ global org.apache.stratos.autoscaler.rule.RuleTasksDelegator $delegator;
global org.apache.stratos.messaging.domain.topology.Topology $topology;
global java.util.Map partitionCtxts;
global java.lang.String clusterId;
+global java.lang.String instanceId;
global java.lang.String lbRef;
global java.lang.Boolean isPrimary;
global Integer primaryMemberCount;
@@ -65,5 +66,5 @@ dialect "mvel"
} else{
log.debug("[min-check] true [primary] false");
}
- $delegator.delegateSpawn($ctxt, clusterId, lbRef, isPrimary);
+ $delegator.delegateSpawn($ctxt, clusterId, instanceId, lbRef, isPrimary);
end
http://git-wip-us.apache.org/repos/asf/stratos/blob/a52de72c/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 103ef0c..b4c8c28 100644
--- a/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
+++ b/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
@@ -50,6 +50,7 @@ global org.apache.stratos.autoscaler.rule.RuleTasksDelegator $delegator;
global org.apache.stratos.autoscaler.policy.model.AutoscalePolicy autoscalePolicy;
global java.lang.String clusterId;
global java.lang.String lbRef;
+global java.lang.String instanceId;
global java.lang.Boolean rifReset;
global java.lang.Boolean mcReset;
global java.lang.Boolean laReset;
@@ -138,7 +139,7 @@ dialect "mvel"
if(partition != null){
log.info("[scale-up] Partition available, hence trying to spawn an instance to scale up!" );
log.debug("[scale-up] " + " [partition] " + partition.getId() + " [cluster] " + clusterId );
- $delegator.delegateSpawn($networkPartitionContext.getPartitionCtxt(partition.getId()), clusterId, lbRef, isPrimary);
+ $delegator.delegateSpawn($networkPartitionContext.getPartitionCtxt(partition.getId()), clusterId, instanceId, lbRef, isPrimary);
count++;
}
}