You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2013/12/27 21:14:32 UTC
[1/2] git commit: Fixed getPredictedValueForNextMinute method return
type in scale down rule
Updated Branches:
refs/heads/master ddf63cb34 -> fa37baaa8
Fixed getPredictedValueForNextMinute method return type in scale down rule
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/a5d48019
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a5d48019
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a5d48019
Branch: refs/heads/master
Commit: a5d48019ebcfea0548b28ba955493491dfef547c
Parents: 0f819bb
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sat Dec 28 01:43:50 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sat Dec 28 01:43:50 2013 +0530
----------------------------------------------------------------------
.../autoscaler/modules/distribution/src/main/conf/scaling.drl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a5d48019/products/autoscaler/modules/distribution/src/main/conf/scaling.drl
----------------------------------------------------------------------
diff --git a/products/autoscaler/modules/distribution/src/main/conf/scaling.drl b/products/autoscaler/modules/distribution/src/main/conf/scaling.drl
index a2ed7b6..175ba88 100644
--- a/products/autoscaler/modules/distribution/src/main/conf/scaling.drl
+++ b/products/autoscaler/modules/distribution/src/main/conf/scaling.drl
@@ -118,7 +118,7 @@ dialect "mvel"
averageLimit : Float() from $loadThresholds.getRequestsInFlight().getAverage()
eval(log.debug("[scale-down] [network-partition] " + $networkPartitionContext.getId() + " [partition] " + partition.getId() + " [cluster] " + clusterId + " Average limit: " + averageLimit))
- predictedValue : Float() from $delegator.getPredictedValueForNextMinute(lbStatAverage, lbStatGradient, lbStatSecondDerivative, 1)
+ predictedValue : Double() from $delegator.getPredictedValueForNextMinute(lbStatAverage, lbStatGradient, lbStatSecondDerivative, 1)
eval(log.debug("[scale-down] [network-partition] " + $networkPartitionContext.getId() + " [partition] " + partition.getId() + " [cluster] " + clusterId + " Predicted value: " + predictedValue))
eval(log.debug("[scale-down] [network-partition] " + $networkPartitionContext.getId() + " [partition] " + partition.getId() + " [cluster] " + clusterId + " Scale-down factor: " + $delegator.SCALE_DOWN_FACTOR))
@@ -135,11 +135,11 @@ dialect "mvel"
LoadAverage loadAverage = memberStatsContext.getLoadAverage();
log.debug("[scale-down] [network-partition] " + $networkPartitionContext.getId() + " [partition] " + partition.getId() + " [cluster] "
- + clusterId + " [member] " + memberStatsContext.getMemberId() + " Load average: " + loadAverage.toString());
+ + clusterId + " [member] " + memberStatsContext.getMemberId() + " Load average: " + loadAverage);
MemoryConsumption memoryConsumption = memberStatsContext.getMemoryConsumption();
log.debug("[scale-down] [network-partition] " + $networkPartitionContext.getId() + " [partition] " + partition.getId() + " [cluster] "
- + clusterId + " [member] " + memberStatsContext.getMemberId() + " Memory consumption: " + memoryConsumption.toString());
+ + clusterId + " [member] " + memberStatsContext.getMemberId() + " Memory consumption: " + memoryConsumption);
double predictedCpu = $delegator.getPredictedValueForNextMinute(loadAverage.getAverage(),loadAverage.getGradient(),loadAverage.getSecondDerivative(), 1);
log.debug("[scale-down] [network-partition] " + $networkPartitionContext.getId() + " [partition] " + partition.getId() + " [cluster] "
[2/2] git commit: Merge remote-tracking branch 'origin/master'
Posted by im...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/fa37baaa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/fa37baaa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/fa37baaa
Branch: refs/heads/master
Commit: fa37baaa8304bd53ba030189d77bd96a8216023b
Parents: a5d4801 ddf63cb
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sat Dec 28 01:44:24 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sat Dec 28 01:44:24 2013 +0530
----------------------------------------------------------------------
.../health/HealthEventMessageDelegator.java | 65 +++++++++++++++++---
.../autoscaler/policy/model/LoadAverage.java | 10 +--
.../policy/model/MemoryConsumption.java | 10 +--
.../autoscaler/rule/RuleTasksDelegator.java | 8 +++
4 files changed, 73 insertions(+), 20 deletions(-)
----------------------------------------------------------------------