You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2014/12/10 10:48:50 UTC
stratos git commit: Remove lower limit usage and logs in scaling Rule
Repository: stratos
Updated Branches:
refs/heads/4.1.0-test 0e689fcd1 -> 52e780279
Remove lower limit usage and logs in scaling Rule
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/52e78027
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/52e78027
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/52e78027
Branch: refs/heads/4.1.0-test
Commit: 52e78027966bd7258226988aec50103010701d9b
Parents: 0e689fc
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Wed Dec 10 15:20:24 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Wed Dec 10 15:20:35 2014 +0530
----------------------------------------------------------------------
.../modules/distribution/src/main/conf/drools/scaling.drl | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/52e78027/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 01b2327..35adcc5 100644
--- a/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
+++ b/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
@@ -73,7 +73,6 @@ dialect "mvel"
rifUpperLimit : Float() from loadThresholds.getRequestsInFlight().getUpperLimit()
- rifLowerLimit : Float() from loadThresholds.getRequestsInFlight().getLowerLimit()
rifAverage : Float() from clusterInstanceContext.getAverageRequestsInFlight()
rifGradient : Float() from clusterInstanceContext.getRequestsInFlightGradient()
@@ -81,12 +80,10 @@ dialect "mvel"
rifPredictedValue : Double() from delegator.getPredictedValueForNextMinute(rifAverage, rifGradient, rifSecondDerivative, 1)
mcUpperLimit : Float() from loadThresholds.getMemoryConsumption().getUpperLimit()
- mcLowerLimit : Float() from loadThresholds.getMemoryConsumption().getLowerLimit()
mcPredictedValue : Double() from delegator.getMemoryConsumptionPredictedValue(clusterInstanceContext)
laUpperLimit : Float() from loadThresholds.getLoadAverage().getUpperLimit()
- laLowerLimit : Float() from loadThresholds.getLoadAverage().getLowerLimit()
laPredictedValue : Double() from delegator.getLoadAveragePredictedValue(clusterInstanceContext)
@@ -95,8 +92,8 @@ dialect "mvel"
averageRequestsServedPerInstance : Float() from clusterInstanceContext.getAverageRequestsServedPerInstance()
numberOfInstancesReuquiredBasedOnRif : Integer() from delegator.getNumberOfInstancesRequiredBasedOnRif(rifPredictedValue, requestsServedPerInstance, averageRequestsServedPerInstance, arspiReset)
- numberOfInstancesReuquiredBasedOnMemoryConsumption : Integer() from delegator.getNumberOfInstancesRequiredBasedOnLoadAndMemoryConsumption(mcUpperLimit , mcLowerLimit, mcPredictedValue ,activeInstancesCount )
- numberOfInstancesReuquiredBasedOnLoadAverage : Integer() from delegator.getNumberOfInstancesRequiredBasedOnLoadAndMemoryConsumption(laUpperLimit , laLowerLimit, laPredictedValue ,activeInstancesCount )
+ numberOfInstancesReuquiredBasedOnMemoryConsumption : Integer() from delegator.getNumberOfInstancesRequiredBasedOnLoadAndMemoryConsumption(mcUpperLimit , mcUpperLimit, mcPredictedValue ,activeInstancesCount )
+ numberOfInstancesReuquiredBasedOnLoadAverage : Integer() from delegator.getNumberOfInstancesRequiredBasedOnLoadAndMemoryConsumption(laUpperLimit , laUpperLimit, laPredictedValue ,activeInstancesCount )
numberOfRequiredInstances : Integer() from delegator.getMaxNumberOfInstancesRequired(numberOfInstancesReuquiredBasedOnRif, numberOfInstancesReuquiredBasedOnMemoryConsumption ,mcReset ,numberOfInstancesReuquiredBasedOnLoadAverage, laReset)
@@ -108,15 +105,12 @@ dialect "mvel"
eval(log.debug("[scaling] " + " [cluster] " + clusterId + " RIF Resetted?: " + rifReset))
eval(log.debug("[scaling] " + " [cluster] " + clusterId + " RIF predicted value: " + rifPredictedValue))
eval(log.debug("[scaling] " + " [cluster] " + clusterId + " RIF upper limit: " + rifUpperLimit))
- eval(log.debug("[scaling] " + " [cluster] " + clusterId + " RIF lower limit: " + rifLowerLimit))
eval(log.debug("[scaling] " + " [cluster] " + clusterId + " MC predicted value: " + mcPredictedValue))
eval(log.debug("[scaling] " + " [cluster] " + clusterId + " MC upper limit: " + mcUpperLimit))
- eval(log.debug("[scaling] " + " [cluster] " + clusterId + " MC lower limit: " + mcLowerLimit))
eval(log.debug("[scaling] " + " [cluster] " + clusterId + " LA predicted value: " + laPredictedValue))
eval(log.debug("[scaling] " + " [cluster] " + clusterId + " LA upper limit: " + laUpperLimit))
- eval(log.debug("[scaling] " + " [cluster] " + clusterId + " LA lower limit: " + laLowerLimit))
eval(log.debug("[scaling] " + " [cluster] " + clusterId + " Scale-up action: " + scaleUp))
eval(log.debug("[scaling] " + " [cluster] " + clusterId + " Scale-down action: " + scaleDown))