You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2015/05/14 16:51:31 UTC
[1/4] stratos git commit: Adding more information to scaleup and
scaledown logs
Repository: stratos
Updated Branches:
refs/heads/master 5e5d78f19 -> 94dc9ec67
Adding more information to scaleup and scaledown logs
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7271c764
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7271c764
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7271c764
Branch: refs/heads/master
Commit: 7271c7640e742a19128f32df3059cd06bdd4e104
Parents: 390e4ff
Author: Vishanth <vi...@gmail.com>
Authored: Thu May 14 19:40:02 2015 +0530
Committer: Vishanth <vi...@gmail.com>
Committed: Thu May 14 19:40:02 2015 +0530
----------------------------------------------------------------------
.../src/main/conf/drools/scaling.drl | 23 +++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/7271c764/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 37c7e07..1008e52 100644
--- a/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
+++ b/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
@@ -167,7 +167,15 @@ dialect "mvel"
ClusterLevelPartitionContext partitionContext = (ClusterLevelPartitionContext) partitionAlgorithm.getNextScaleUpPartitionContext(clusterInstanceContext.getPartitionCtxtsAsAnArray());
if(partitionContext != null){
- log.info("[scale-up] Partition available, hence trying to spawn an instance to scale up!" );
+ log.info("[scale-up] Partition available, hence trying to spawn an instance to scale up! " +
+ " [partition] " + partitionContext.getPartitionId() + " [cluster] " + clusterId +
+ " scaleup due to RIF: " + (rifReset && (rifPredictedValue > rifThreshold)) +
+ " [rifPredictedValue] " + rifPredictedValue + " [rifThreshold] " + rifThreshold +
+ " scaleup due to MC: " + (mcReset && (mcPredictedValue > mcThreshold)) +
+ " [mcPredictedValue] " + mcPredictedValue + " [mcThreshold] " + mcThreshold +
+ " scaleup due to MC: " + (laReset && (laPredictedValue > laThreshold)) +
+ " [laPredictedValue] " + laPredictedValue + " [laThreshold] " + laThreshold);
+
log.debug("[scale-up] " + " [partition] " + partitionContext.getPartitionId() + " [cluster] " + clusterId );
delegator.delegateSpawn(partitionContext, clusterId, clusterInstanceContext.getId(), isPrimary);
count++;
@@ -208,10 +216,15 @@ dialect "mvel"
boolean foundAValue = false;
ClusterLevelPartitionContext partitionContext = (ClusterLevelPartitionContext) partitionAlgorithm.getNextScaleDownPartitionContext(clusterInstanceContext.getPartitionCtxtsAsAnArray());
if(partitionContext != null){
- log.info("[scale-down] Partition available to scale down ");
- // log.debug("[scale-down] " + " [partition] " + partition.getId() + " [cluster] " + clusterId);
- // partitionContext = clusterInstanceContext.getPartitionCtxt(partition.getId());
- //
+ log.info("[scale-down] Partition available to scale down " +
+ " [partition] " + partitionContext.getPartitionId() + " [cluster] " + clusterId +
+ " scaledown due to RIF: " + (rifReset && (rifPredictedValue < rifThreshold)) +
+ " [rifPredictedValue] " + rifPredictedValue + " [rifThreshold] " + rifThreshold +
+ " scaledown due to MC: " + (mcReset && (mcPredictedValue < mcThreshold)) +
+ " [mcPredictedValue] " + mcPredictedValue + " [mcThreshold] " + mcThreshold +
+ " scaledown due to MC: " + (laReset && (laPredictedValue < laThreshold)) +
+ " [laPredictedValue] " + laPredictedValue + " [laThreshold] " + laThreshold
+ );
// In partition context member stat context, all the primary members need to be
// avoided being selected as the member to terminated
[2/4] stratos git commit: Adding more information to improve the
scaling log
Posted by ud...@apache.org.
Adding more information to improve the scaling log
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/48d9bc16
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/48d9bc16
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/48d9bc16
Branch: refs/heads/master
Commit: 48d9bc16dee0fabc0ffe36457f00daa4c1967e10
Parents: 7271c76
Author: Vishanth <vi...@gmail.com>
Authored: Thu May 14 20:15:15 2015 +0530
Committer: Vishanth <vi...@gmail.com>
Committed: Thu May 14 20:15:15 2015 +0530
----------------------------------------------------------------------
.../autoscaler/monitor/cluster/ClusterMonitor.java | 1 +
.../distribution/src/main/conf/drools/scaling.drl | 11 +++++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/48d9bc16/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 750daa6..64a5ab2 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
@@ -438,6 +438,7 @@ public class ClusterMonitor extends Monitor {
log.info("Executing scaling rule as statistics have been reset");
ClusterContext clusterContext = ClusterMonitor.this.clusterContext;
+ instanceContext.getScaleCheckKnowledgeSession().setGlobal("applicationId", getAppId());
instanceContext.getScaleCheckKnowledgeSession().setGlobal("clusterId", getClusterId());
instanceContext.getScaleCheckKnowledgeSession().setGlobal("rifReset", rifReset);
instanceContext.getScaleCheckKnowledgeSession().setGlobal("mcReset", memoryConsumptionReset);
http://git-wip-us.apache.org/repos/asf/stratos/blob/48d9bc16/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 1008e52..72530da 100644
--- a/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
+++ b/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
@@ -46,6 +46,7 @@ import org.apache.stratos.autoscaler.pojo.policy.autoscale.MemoryConsumption
global org.apache.stratos.autoscaler.rule.RuleLog log;
global org.apache.stratos.autoscaler.rule.RuleTasksDelegator delegator;
global org.apache.stratos.autoscaler.pojo.policy.autoscale.AutoscalePolicy autoscalePolicy;
+global java.lang.String applicationId;
global java.lang.String clusterId;
global java.lang.Boolean rifReset;
global java.lang.Boolean mcReset;
@@ -168,7 +169,10 @@ dialect "mvel"
if(partitionContext != null){
log.info("[scale-up] Partition available, hence trying to spawn an instance to scale up! " +
- " [partition] " + partitionContext.getPartitionId() + " [cluster] " + clusterId +
+ " [application id] " + applicationId +
+ " [cluster] " + clusterId + " [instance id] " + clusterInstanceContext.getId() +
+ " [network-partition] " + clusterInstanceContext.getNetworkPartitionId() +
+ " [partition] " + partitionContext.getPartitionId() +
" scaleup due to RIF: " + (rifReset && (rifPredictedValue > rifThreshold)) +
" [rifPredictedValue] " + rifPredictedValue + " [rifThreshold] " + rifThreshold +
" scaleup due to MC: " + (mcReset && (mcPredictedValue > mcThreshold)) +
@@ -217,7 +221,10 @@ dialect "mvel"
ClusterLevelPartitionContext partitionContext = (ClusterLevelPartitionContext) partitionAlgorithm.getNextScaleDownPartitionContext(clusterInstanceContext.getPartitionCtxtsAsAnArray());
if(partitionContext != null){
log.info("[scale-down] Partition available to scale down " +
- " [partition] " + partitionContext.getPartitionId() + " [cluster] " + clusterId +
+ " [application id] " + applicationId +
+ " [cluster] " + clusterId + " [instance id] " + clusterInstanceContext.getId() +
+ " [network-partition] " + clusterInstanceContext.getNetworkPartitionId() +
+ " [partition] " + partitionContext.getPartitionId() +
" scaledown due to RIF: " + (rifReset && (rifPredictedValue < rifThreshold)) +
" [rifPredictedValue] " + rifPredictedValue + " [rifThreshold] " + rifThreshold +
" scaledown due to MC: " + (mcReset && (mcPredictedValue < mcThreshold)) +
[3/4] stratos git commit: add a debug log when creating floatingip
from a pool
Posted by ud...@apache.org.
add a debug log when creating floatingip from a pool
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/fc7b0b19
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/fc7b0b19
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/fc7b0b19
Branch: refs/heads/master
Commit: fc7b0b196624030f6d03dd75ee467474ed352b89
Parents: 5e5d78f
Author: Udara Liyanage <ud...@wso2.com>
Authored: Thu May 14 20:16:54 2015 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Thu May 14 20:16:54 2015 +0530
----------------------------------------------------------------------
.../controller/iaases/openstack/networking/NovaNetworkingApi.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/fc7b0b19/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NovaNetworkingApi.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NovaNetworkingApi.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NovaNetworkingApi.java
index b0e24f2..efe439c 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NovaNetworkingApi.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NovaNetworkingApi.java
@@ -93,6 +93,7 @@ public class NovaNetworkingApi implements OpenstackNetworkingApi {
if ((defaultFloatingIpPool == null) || "".equals(defaultFloatingIpPool)) {
allocatedFloatingIP = floatingIPApi.create();
} else {
+ log.debug(String.format("trying to allocate floating IP from pool %s", defaultFloatingIpPool));
allocatedFloatingIP = floatingIPApi.allocateFromPool(defaultFloatingIpPool);
}
if (allocatedFloatingIP == null) {
[4/4] stratos git commit: Merge branch 'scaling-drool' of
https://github.com/Vishanth/stratos
Posted by ud...@apache.org.
Merge branch 'scaling-drool' of https://github.com/Vishanth/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/94dc9ec6
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/94dc9ec6
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/94dc9ec6
Branch: refs/heads/master
Commit: 94dc9ec6785a742611323db65c04a70ecac44ab4
Parents: fc7b0b1 48d9bc1
Author: Udara Liyanage <ud...@wso2.com>
Authored: Thu May 14 20:21:11 2015 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Thu May 14 20:21:11 2015 +0530
----------------------------------------------------------------------
.../monitor/cluster/ClusterMonitor.java | 1 +
.../src/main/conf/drools/scaling.drl | 30 ++++++++++++++++----
2 files changed, 26 insertions(+), 5 deletions(-)
----------------------------------------------------------------------