apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix duration

Browse Source
This commit is contained in:
tuna 2013-10-14 17:54:12 +07:00
parent fca6d56681
commit 0b0e2627d6
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/src/com/cloud/server/StatsCollector.java
View File

@ -767,7 +767,11 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc
AutoScalePolicyVO policyVO = _asPolicyDao.findById(asVmgPmap.getPolicyId());
if (policyVO != null) {
Integer quitetime = policyVO.getQuietTime();
long last_quitetime = policyVO.getLastQuiteTime().getTime();
Date quitetimeDate = policyVO.getLastQuiteTime();
long last_quitetime = 0L;
if (quitetimeDate != null) {
last_quitetime = policyVO.getLastQuiteTime().getTime();
}
long current_time = (new Date()).getTime();
// check quite time for this policy
@ -779,16 +783,17 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc
if ((lstConditions != null) && (lstConditions.size() > 0)) {
// check whole conditions of this policy
for (ConditionVO conditionVO : lstConditions) {
long threholdValue = conditionVO.getThreshold();
long thresholdValue = conditionVO.getThreshold();
Double thresholdPercent = (double)thresholdValue / 100;
Double sum = avgCounter.get(conditionVO.getCounterid());
Double avg = sum/ currentVM;
Operator op = conditionVO.getRelationalOperator();
boolean bConditionCheck = ((op == com.cloud.network.as.Condition.Operator.EQ) && (threholdValue == avg))
|| ((op == com.cloud.network.as.Condition.Operator.GE) && (avg >= threholdValue))
|| ((op == com.cloud.network.as.Condition.Operator.GT) && (avg > threholdValue))
|| ((op == com.cloud.network.as.Condition.Operator.LE) && (avg <= threholdValue))
|| ((op == com.cloud.network.as.Condition.Operator.LT) && (avg < threholdValue));
boolean bConditionCheck = ((op == com.cloud.network.as.Condition.Operator.EQ) && (thresholdPercent == avg))
|| ((op == com.cloud.network.as.Condition.Operator.GE) && (avg >= thresholdPercent))
|| ((op == com.cloud.network.as.Condition.Operator.GT) && (avg > thresholdPercent))
|| ((op == com.cloud.network.as.Condition.Operator.LE) && (avg <= thresholdPercent))
|| ((op == com.cloud.network.as.Condition.Operator.LT) && (avg < thresholdPercent));
if (!bConditionCheck) {
bValid = false;