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/10 06:30:02 UTC
stratos git commit: Fixing algorithm name in scaling rule and adding
a info log
Repository: stratos
Updated Branches:
refs/heads/4.1.0-test 04900bbda -> ff1d57ae5
Fixing algorithm name in scaling rule and adding a info log
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ff1d57ae
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ff1d57ae
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ff1d57ae
Branch: refs/heads/4.1.0-test
Commit: ff1d57ae5b2bb5f625e4281eeb6a6c97ef37960f
Parents: 04900bb
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Wed Dec 10 11:01:04 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Wed Dec 10 11:01:14 2014 +0530
----------------------------------------------------------------------
.../monitor/cluster/VMClusterMonitor.java | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/ff1d57ae/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java
index 13f5433..cf1e090 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java
@@ -195,6 +195,7 @@ public class VMClusterMonitor extends AbstractClusterMonitor {
for (final ClusterInstanceContext instanceContext : clusterInstanceContexts) {
ClusterInstance instance = (ClusterInstance) this.instanceIdToInstanceMap.
get(instanceContext.getId());
+
if ((instance.getStatus().getCode() <= ClusterStatus.Active.getCode()) ||
(instance.getStatus() == ClusterStatus.Inactive && !hasStartupDependents)
&& !this.hasFaultyMember) {
@@ -259,23 +260,24 @@ public class VMClusterMonitor extends AbstractClusterMonitor {
+ " [Is memoryConsumption Reset] : " + memoryConsumptionReset
+ " [Is loadAverage Reset] : " + loadAverageReset);
}
- if (rifReset || memoryConsumptionReset || loadAverageReset) {
+ if (rifReset || memoryConsumptionReset || loadAverageReset) {
+ log.info("Executing scaling rule as stats has been reset");
VMClusterContext vmClusterContext = (VMClusterContext) clusterContext;
getScaleCheckKnowledgeSession().setGlobal("clusterId", getClusterId());
- getScaleCheckKnowledgeSession().setGlobal("autoscalePolicy",
- vmClusterContext.getAutoscalePolicy());
getScaleCheckKnowledgeSession().setGlobal("rifReset", rifReset);
- //TODO to parse actual value
- getScaleCheckKnowledgeSession().setGlobal("arspiReset", averageRequestServedPerInstanceReset);
getScaleCheckKnowledgeSession().setGlobal("mcReset", memoryConsumptionReset);
getScaleCheckKnowledgeSession().setGlobal("laReset", loadAverageReset);
getScaleCheckKnowledgeSession().setGlobal("isPrimary", hasPrimary);
- getScaleCheckKnowledgeSession().setGlobal("primaryMembers", primaryMemberListInClusterInstance);
- getMinCheckKnowledgeSession().setGlobal("algorithmName",
- paritionAlgo);
+ getScaleCheckKnowledgeSession().setGlobal("algorithmName", paritionAlgo);
+ getScaleCheckKnowledgeSession().setGlobal("autoscalePolicy",
+ vmClusterContext.getAutoscalePolicy());
+ getScaleCheckKnowledgeSession().setGlobal("arspiReset",
+ averageRequestServedPerInstanceReset);
+ getScaleCheckKnowledgeSession().setGlobal("primaryMembers",
+ primaryMemberListInClusterInstance);
if (log.isDebugEnabled()) {
log.debug(String.format("Running scale check for [cluster instance context] %s ",