Repository: incubator-stratos Updated Branches: refs/heads/master 512f969a5 -> 8551d02cf
Fix from Nirmal: changed scale down rule to consider all three factors; request in flight, memory consumption and load average for taking the scale down decision Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8551d02c Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8551d02c Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8551d02c Branch: refs/heads/master Commit: 8551d02cf23e6a27a78cdb5076b47538d903c731 Parents: 512f969 Author: Imesh Gunaratne <[email protected]> Authored: Wed Apr 23 09:44:35 2014 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Wed Apr 23 09:44:35 2014 +0530 ---------------------------------------------------------------------- products/stratos/modules/distribution/src/main/conf/scaling.drl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8551d02c/products/stratos/modules/distribution/src/main/conf/scaling.drl ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/main/conf/scaling.drl b/products/stratos/modules/distribution/src/main/conf/scaling.drl index be13a4b..c192cd2 100644 --- a/products/stratos/modules/distribution/src/main/conf/scaling.drl +++ b/products/stratos/modules/distribution/src/main/conf/scaling.drl @@ -87,7 +87,7 @@ dialect "mvel" laPredictedValue : Double() from $delegator.getPredictedValueForNextMinute(loadAverageAverage, loadAverageGradient, loadAverageSecondDerivative, 1) scaleUp : Boolean() from ((rifReset && (rifPredictedValue > rifAverageLimit * 0.8)) || (mcReset && (mcPredictedValue > mcAverageLimit * 0.8)) || (laReset && (laPredictedValue > laAverageLimit * 0.8))) - scaleDown : Boolean() from ((rifReset && (rifPredictedValue < rifAverageLimit * 0.1)) || (mcReset && (mcPredictedValue < mcAverageLimit * 0.1)) || (laReset && (laPredictedValue < laAverageLimit * 0.1))) + scaleDown : Boolean() from ((rifReset && (rifPredictedValue < rifAverageLimit * 0.1)) && (mcReset && (mcPredictedValue < mcAverageLimit * 0.1)) && (laReset && (laPredictedValue < laAverageLimit * 0.1))) eval(log.debug("[scaling] " + " [cluster] " + clusterId + " RIF predicted value: " + rifPredictedValue)) eval(log.debug("[scaling] " + " [cluster] " + clusterId + " RIF average limit: " + rifAverageLimit))
