etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CS-15593: Conditions are checked in database before used

This commit is contained in:
Vijay 2012-07-17 17:55:01 +05:30
parent c755172a3a
commit df84f88296
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/src/com/cloud/api/commands/CreateAutoScalePolicyCmd.java
View File

@ -24,10 +24,12 @@ import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.AutoScalePolicyResponse;
import com.cloud.async.AsyncJob;
import com.cloud.domain.Domain;
import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.network.as.AutoScalePolicy;
import com.cloud.network.as.Condition;
import com.cloud.user.Account;
@Implementation(description = "Creates an autoscale policy for a provision or deprovision action, the action is taken when the all the conditions evaluates to true for the specified duration. The policy is in effect once it is attached to a autscale vm group.", responseObject = AutoScalePolicyResponse.class)
public class CreateAutoScalePolicyCmd extends BaseAsyncCreateCmd {
@ -116,8 +118,14 @@ public class CreateAutoScalePolicyCmd extends BaseAsyncCreateCmd {
}
long conditionId = getConditionIds().get(0);
Condition condition = _entityMgr.findById(Condition.class, conditionId);
conditionDomainId = condition.getDomainId();
conditionAccountId = condition.getAccountId();
if(condition == null) {
// it is an invalid condition, return system acccount, error will be thrown later.
conditionDomainId = Domain.ROOT_DOMAIN;
conditionAccountId = Account.ACCOUNT_ID_SYSTEM;
} else {
conditionDomainId = condition.getDomainId();
conditionAccountId = condition.getAccountId();
}
return conditionAccountId;
}

2
server/src/com/cloud/network/as/AutoScaleManagerImpl.java
View File

@ -421,7 +421,7 @@ public class AutoScaleManagerImpl<Type> implements AutoScaleService, Manager {
if (conditionIds.size() != conditions.size()) {
// TODO report the condition id which could not be found
throw new InvalidParameterValueException("Unable to find a condition specified");
throw new InvalidParameterValueException("Unable to find the condition specified");
}
ArrayList<Long> counterIds = new ArrayList<Long>();