You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/10/06 21:34:31 UTC
[1/2] stratos git commit: Adding debug logs for ClusterMonitor events
Repository: stratos
Updated Branches:
refs/heads/stratos-4.1.x 11e618c3b -> f882ca630
Adding debug logs for ClusterMonitor events
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d7bf17ce
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d7bf17ce
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d7bf17ce
Branch: refs/heads/stratos-4.1.x
Commit: d7bf17cecfc597596d2966fdbe69621f17998f21
Parents: 11e618c
Author: Akila Perera <ra...@gmail.com>
Authored: Wed Oct 7 00:48:51 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Wed Oct 7 00:48:51 2015 +0530
----------------------------------------------------------------------
.../org.apache.stratos.autoscaler/pom.xml | 6 +++
.../monitor/cluster/ClusterMonitor.java | 53 ++++++++++++--------
.../distribution/src/main/conf/log4j.properties | 8 +++
3 files changed, 47 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d7bf17ce/components/org.apache.stratos.autoscaler/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/pom.xml b/components/org.apache.stratos.autoscaler/pom.xml
index 5b106b8..150e380 100644
--- a/components/org.apache.stratos.autoscaler/pom.xml
+++ b/components/org.apache.stratos.autoscaler/pom.xml
@@ -209,6 +209,12 @@
</Export-Package>
<Import-Package>
org.apache.stratos.common.services.*; version="${project.version}",
+ org.apache.stratos.common.threading.*; version="${project.version}",
+ org.apache.stratos.common.client.*; version="${project.version}",
+ org.apache.stratos.common.partition.*; version="${project.version}",
+ org.apache.stratos.common.constants.*; version="${project.version}",
+ org.apache.stratos.common.*; version="${project.version}",
+ org.apache.stratos.cloud.controller.stub.*; version="${project.version}",
*;resolution:=optional
</Import-Package>
<Bundle-Activator>org.apache.stratos.autoscaler.internal.ASBundleActivater</Bundle-Activator>
http://git-wip-us.apache.org/repos/asf/stratos/blob/d7bf17ce/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 aadad54..c2dd411 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
@@ -338,19 +338,20 @@ public class ClusterMonitor extends Monitor {
paritionAlgo);
if (log.isDebugEnabled()) {
- log.debug(String.format("Running minimum check for cluster instance %s ",
- instanceContext.getId() + " for the cluster: " + clusterId));
+ log.debug(String.format("Running minimum check for [cluster instance] %s, " +
+ "[cluster id] %s",
+ instanceContext.getId(), clusterId));
}
instanceContext.setMinCheckFactHandle(evaluate(instanceContext.
getMinCheckKnowledgeSession(),
instanceContext.getMinCheckFactHandle(), instanceContext));
instanceContext.getMaxCheckKnowledgeSession().setGlobal("clusterId", getClusterId());
+
if (log.isDebugEnabled()) {
- log.debug(String.format("Running max check for cluster instance %s ",
- instanceContext.getId() + " for the cluster: " + clusterId));
+ log.debug(String.format("Running maximum check for [cluster instance] %s, " +
+ "[cluster id] %s", instanceContext.getId(), clusterId));
}
-
instanceContext.setMaxCheckFactHandle(evaluate(instanceContext.
getMaxCheckKnowledgeSession(),
instanceContext.getMaxCheckFactHandle(), instanceContext));
@@ -364,16 +365,7 @@ public class ClusterMonitor extends Monitor {
= instanceContext.isAverageRequestServedPerInstanceReset();
if (rifReset || memoryConsumptionReset || loadAverageReset) {
-
- if (log.isDebugEnabled()) {
- log.debug("Executing scaling Rule, [Is rif Reset] : " + rifReset
- + " [Is memoryConsumption Reset] : " + memoryConsumptionReset
- + " [Is loadAverage Reset] : " + loadAverageReset + "[cluster] " +
- clusterId);
- }
-
ClusterContext clusterContext = ClusterMonitor.this.clusterContext;
-
instanceContext.getScaleCheckKnowledgeSession().setGlobal("applicationId", getAppId());
instanceContext.getScaleCheckKnowledgeSession().setGlobal("clusterId", getClusterId());
instanceContext.getScaleCheckKnowledgeSession().setGlobal("rifReset", rifReset);
@@ -384,7 +376,13 @@ public class ClusterMonitor extends Monitor {
clusterContext.getAutoscalePolicy());
instanceContext.getScaleCheckKnowledgeSession().setGlobal("arspiReset",
averageRequestServedPerInstanceReset);
-
+ if (log.isDebugEnabled()) {
+ log.debug("Running scale check, [Is rif Reset] " + rifReset + ", " +
+ "[Is memoryConsumption Reset] " + memoryConsumptionReset + ", " +
+ "[Is loadAverage Reset] " + loadAverageReset + ", " +
+ "[cluster] " + clusterId + ", " +
+ "[cluster instance] " + instanceContext.getId());
+ }
instanceContext.setScaleCheckFactHandle(evaluate(
instanceContext.getScaleCheckKnowledgeSession()
, instanceContext.getScaleCheckFactHandle(), instanceContext));
@@ -427,6 +425,13 @@ public class ClusterMonitor extends Monitor {
@Override
public void run() {
instanceContext.getObsoleteCheckKnowledgeSession().setGlobal("clusterId", clusterId);
+
+ if (log.isDebugEnabled()) {
+ log.debug(String.format("Running obsolete check for [partition id] %s, " +
+ "[cluster instance] %s, [cluster id] %s",
+ partitionContext.getPartitionId(), instanceContext.getId(), clusterId));
+ }
+
instanceContext.setObsoleteCheckFactHandle(evaluate(
instanceContext.getObsoleteCheckKnowledgeSession(),
instanceContext.getObsoleteCheckFactHandle(), partitionContext));
@@ -526,11 +531,12 @@ public class ClusterMonitor extends Monitor {
@Override
public void onParentScalingEvent(ScalingEvent scalingEvent) {
-
- log.info("Parent scaling event received to [cluster]: " + this.getClusterId()
- + ", [network partition]: " + scalingEvent.getNetworkPartitionId()
- + ", [event] " + scalingEvent.getId() + ", [group instance] " + scalingEvent.getInstanceId()
- + ", [factor] " + scalingEvent.getFactor());
+ if (log.isDebugEnabled()) {
+ log.debug("Parent scaling event received to [cluster]: " + this.getClusterId()
+ + ", [network partition]: " + scalingEvent.getNetworkPartitionId()
+ + ", [event] " + scalingEvent.getId() + ", [group instance] " + scalingEvent.getInstanceId()
+ + ", [factor] " + scalingEvent.getFactor());
+ }
float scalingFactorBasedOnDependencies = scalingEvent.getFactor();
ClusterContext vmClusterContext = clusterContext;
@@ -548,6 +554,13 @@ public class ClusterMonitor extends Monitor {
clusterInstanceContext.getDependentScaleCheckKnowledgeSession().setGlobal("clusterId", getClusterId());
clusterInstanceContext.getDependentScaleCheckKnowledgeSession().setGlobal("roundedRequiredInstanceCount", roundedRequiredInstanceCount);
clusterInstanceContext.getDependentScaleCheckKnowledgeSession().setGlobal("algorithmName", clusterInstanceContext.getPartitionAlgorithm());
+
+ if (log.isDebugEnabled()) {
+ log.debug(String.format("Running dependent scale check for [cluster instance] %s, " +
+ "[cluster id] %s",
+ clusterInstanceContext.getId(), clusterId));
+ }
+
clusterInstanceContext.setDependentScaleCheckFactHandle(evaluate(
clusterInstanceContext.getDependentScaleCheckKnowledgeSession()
, clusterInstanceContext.getDependentScaleCheckFactHandle(), clusterInstanceContext));
http://git-wip-us.apache.org/repos/asf/stratos/blob/d7bf17ce/products/stratos/modules/distribution/src/main/conf/log4j.properties
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/log4j.properties b/products/stratos/modules/distribution/src/main/conf/log4j.properties
index 6a244f9..72ad1c4 100644
--- a/products/stratos/modules/distribution/src/main/conf/log4j.properties
+++ b/products/stratos/modules/distribution/src/main/conf/log4j.properties
@@ -60,6 +60,14 @@ log4j.logger.org.wso2.andes.client=ERROR
# Autoscaler rule logs
log4j.logger.org.apache.stratos.autoscaler.rule.RuleLog=INFO
+# Apache jclouds
+#log4j.logger.jclouds.wire=DEBUG
+#log4j.logger.jclouds.headers=DEBUG
+#log4j.logger.org.jclouds=DEBUG
+
+# CEP Window processors
+#log4j.logger.org.apache.stratos.cep.extension.FaultHandlingWindowProcessor=DEBUG
+
log4j.logger.org.apache.axis2.enterprise=FATAL, CARBON_LOGFILE, CARBON_MEMORY
log4j.logger.org.opensaml.xml=WARN, CARBON_LOGFILE, CARBON_MEMORY
log4j.logger.org.apache.directory.shared.ldap=WARN, CARBON_LOGFILE, CARBON_MEMORY
[2/2] stratos git commit: Set Autoscaler and CloudController logging
level to DEBUG for integration tests
Posted by ra...@apache.org.
Set Autoscaler and CloudController logging level to DEBUG for integration tests
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f882ca63
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f882ca63
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f882ca63
Branch: refs/heads/stratos-4.1.x
Commit: f882ca630c4e4183b62d708889f2a06e05d8a180
Parents: d7bf17c
Author: Akila Perera <ra...@gmail.com>
Authored: Wed Oct 7 00:49:40 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Wed Oct 7 00:49:40 2015 +0530
----------------------------------------------------------------------
.../src/test/resources/common/log4j.properties | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/f882ca63/products/stratos/modules/integration/test-integration/src/test/resources/common/log4j.properties
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/test-integration/src/test/resources/common/log4j.properties b/products/stratos/modules/integration/test-integration/src/test/resources/common/log4j.properties
index 72ad1c4..44aa5c9 100644
--- a/products/stratos/modules/integration/test-integration/src/test/resources/common/log4j.properties
+++ b/products/stratos/modules/integration/test-integration/src/test/resources/common/log4j.properties
@@ -53,12 +53,12 @@ log4j.logger.org.wso2=INFO
# Apache Stratos logging configuration
log4j.logger.org.apache.stratos.manager=INFO
-log4j.logger.org.apache.stratos.autoscaler=INFO
+log4j.logger.org.apache.stratos.autoscaler=DEBUG
log4j.logger.org.apache.stratos.messaging=INFO
-log4j.logger.org.apache.stratos.cloud.controller=INFO
+log4j.logger.org.apache.stratos.cloud.controller=DEBUG
log4j.logger.org.wso2.andes.client=ERROR
# Autoscaler rule logs
-log4j.logger.org.apache.stratos.autoscaler.rule.RuleLog=INFO
+log4j.logger.org.apache.stratos.autoscaler.rule.RuleLog=DEBUG
# Apache jclouds
#log4j.logger.jclouds.wire=DEBUG