Updated Branches: refs/heads/master 87f8d5d51 -> 1f5a3ad95
Get the sclaing rates from rules file itself Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/b1c72b5a Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b1c72b5a Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b1c72b5a Branch: refs/heads/master Commit: b1c72b5a901d467dbc75c0c2723158d0987651ec Parents: b48bfcd Author: Lahiru Sandaruwan <[email protected]> Authored: Fri Jan 17 18:19:38 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Fri Jan 17 18:19:38 2014 +0530 ---------------------------------------------------------------------- .../modules/distribution/src/main/conf/scaling.drl | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b1c72b5a/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 29b7c55..4955e0d 100644 --- a/products/autoscaler/modules/distribution/src/main/conf/scaling.drl +++ b/products/autoscaler/modules/distribution/src/main/conf/scaling.drl @@ -86,11 +86,8 @@ dialect "mvel" laAverageLimit : Float() from $loadThresholds.getLoadAverage().getAverage() laPredictedValue : Double() from $delegator.getPredictedValueForNextMinute(loadAverageAverage, loadAverageGradient, loadAverageSecondDerivative, 1) - eval(log.debug("[scaling] " + " [cluster] " + clusterId + " Scale-up factor: " + $delegator.SCALE_UP_FACTOR)) - eval(log.debug("[scaling] " + " [cluster] " + clusterId + " Scale-down factor: " + $delegator.SCALE_DOWN_FACTOR)) - - scaleUp : Boolean() from ((rifReset && (rifPredictedValue > rifAverageLimit * $delegator.SCALE_UP_FACTOR)) || (mcReset && (mcPredictedValue > mcAverageLimit * $delegator.SCALE_UP_FACTOR)) || (laReset && (laPredictedValue > laAverageLimit * $delegator.SCALE_UP_FACTOR))) - scaleDown : Boolean() from ((rifReset && (rifPredictedValue < rifAverageLimit * $delegator.SCALE_DOWN_FACTOR)) || (mcReset && (mcPredictedValue < mcAverageLimit * $delegator.SCALE_DOWN_FACTOR)) || (laReset && (laPredictedValue < laAverageLimit * $delegator.SCALE_DOWN_FACTOR))) + 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))) eval(log.debug("[scaling] " + " [cluster] " + clusterId + " RIF predicted value: " + rifPredictedValue)) eval(log.debug("[scaling] " + " [cluster] " + clusterId + " RIF average limit: " + rifAverageLimit)) @@ -116,7 +113,7 @@ dialect "mvel" } } else if(scaleDown){ - if($networkPartitionContext.getScaleDownRequestsCount() > $networkPartitionContext.getScaleDownWaitCount()){ + if($networkPartitionContext.getScaleDownRequestsCount() > 5 ){ $networkPartitionContext.resetScaleDownRequestsCount(); MemberStatsContext selectedMemberStatsContext = null;
