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 2015/02/24 13:55:59 UTC

stratos git commit: Fix cluster id null value in log and remove unnecessary log

Repository: stratos
Updated Branches:
  refs/heads/master 3c4af466a -> 57e3ccafb


Fix cluster id null value in log and remove unnecessary log


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

Branch: refs/heads/master
Commit: 57e3ccafb93ef1ef14ade226629e472e42f85933
Parents: 3c4af46
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Tue Feb 24 18:25:44 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Tue Feb 24 18:25:44 2015 +0530

----------------------------------------------------------------------
 .../apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java   | 1 +
 .../stratos/modules/distribution/src/main/conf/drools/scaling.drl   | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/57e3ccaf/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java
index 6ea9f9f..aaf753c 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java
@@ -594,6 +594,7 @@ public class ClusterMonitor extends Monitor implements Runnable {
                         Runnable monitoringRunnable = new Runnable() {
                             @Override
                             public void run() {
+                                getObsoleteCheckKnowledgeSession().setGlobal("clusterId", clusterId);
                                 obsoleteCheckFactHandle = AutoscalerRuleEvaluator.evaluate(
                                         getObsoleteCheckKnowledgeSession(), obsoleteCheckFactHandle, partitionContext);
                             }

http://git-wip-us.apache.org/repos/asf/stratos/blob/57e3ccaf/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 c4771f5..63f9d4e 100644
--- a/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
+++ b/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
@@ -67,7 +67,6 @@ dialect "mvel"
 
         eval(log.debug("Running scale up rule: [network-partition] " + clusterInstanceContext.getNetworkPartitionId() + " [cluster] " + clusterId))
         eval(log.debug("[scaling] [network-partition] " + clusterInstanceContext.getNetworkPartitionId() + " [cluster] " + clusterId + " Algorithm name: " + algorithmName))
-        eval(log.debug("[scaling] [network-partition] " + clusterInstanceContext.getNetworkPartitionId() + " [cluster] " + clusterId + " Algorithm: " + autoscaleAlgorithm))
 
 	
         rifThreshold : Float() from  loadThresholds.getRequestsInFlightThreshold()