apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch 'CLOUDSTACK-7703' of https://github.com/anshul1886/cloudstack-1"

Browse Source 
This reverts commit d5b6fc4f04450bb2ff733f2eaf1ae800578be567, reversing
changes made to 91ffaaa5a2163b2b62868097dea587bd712061d8.
This commit is contained in:
Rajesh Battala 2014-11-17 16:05:32 +05:30
parent d5b6fc4f04
commit 3a4d70e696
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
View File

@ -31,6 +31,7 @@ import javax.ejb.Local;
import javax.inject.Inject; import javax.inject.Inject;
import javax.naming.ConfigurationException; import javax.naming.ConfigurationException;
import com.cloud.utils.fsm.StateMachine2;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.apache.cloudstack.affinity.AffinityGroupProcessor; import org.apache.cloudstack.affinity.AffinityGroupProcessor;
@ -120,7 +121,6 @@ import com.cloud.utils.db.TransactionCallback;
import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.db.TransactionStatus;
import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.fsm.StateListener; import com.cloud.utils.fsm.StateListener;
import com.cloud.utils.fsm.StateMachine2;
import com.cloud.vm.DiskProfile; import com.cloud.vm.DiskProfile;
import com.cloud.vm.VMInstanceVO; import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachine;
@ -990,10 +990,7 @@ StateListener<State, VirtualMachine.Event, VirtualMachine> {
// if all hosts or all pools in the cluster are in avoid set after this // if all hosts or all pools in the cluster are in avoid set after this
// pass, then put the cluster in avoid set. // pass, then put the cluster in avoid set.
boolean avoidAllHosts = true; boolean avoidAllHosts = true, avoidAllPools = true;
boolean avoidAllPools = true;
boolean avoidAllLocalPools = true;
boolean avoidAllSharedPools = true;
List<HostVO> allhostsInCluster = List<HostVO> allhostsInCluster =
_hostDao.listAllUpAndEnabledNonHAHosts(Host.Type.Routing, clusterVO.getId(), clusterVO.getPodId(), clusterVO.getDataCenterId(), null); _hostDao.listAllUpAndEnabledNonHAHosts(Host.Type.Routing, clusterVO.getId(), clusterVO.getPodId(), clusterVO.getDataCenterId(), null);
@ -1027,7 +1024,7 @@ StateListener<State, VirtualMachine.Event, VirtualMachine> {
for (StoragePoolVO pool : allPoolsInCluster) { for (StoragePoolVO pool : allPoolsInCluster) {
if (!allocatorAvoidOutput.shouldAvoid(pool)) { if (!allocatorAvoidOutput.shouldAvoid(pool)) {
// there's some pool in the cluster that is not yet in avoid set // there's some pool in the cluster that is not yet in avoid set
avoidAllSharedPools = false; avoidAllPools = false;
break; break;
} }
} }
@ -1041,19 +1038,11 @@ StateListener<State, VirtualMachine.Event, VirtualMachine> {
if (!allocatorAvoidOutput.shouldAvoid(pool)) { if (!allocatorAvoidOutput.shouldAvoid(pool)) {
// there's some pool in the cluster that is not yet // there's some pool in the cluster that is not yet
// in avoid set // in avoid set
avoidAllLocalPools = false; avoidAllPools = false;
break; break;
} }
} }
} }
if (vmRequiresSharedStorage && vmRequiresLocalStorege) {
avoidAllPools = (avoidAllLocalPools || avoidAllSharedPools) ? true : false;
} else if (vmRequiresSharedStorage) {
avoidAllPools = avoidAllSharedPools;
} else if (vmRequiresLocalStorege) {
avoidAllPools = avoidAllLocalPools;
}
} }
if (avoidAllHosts || avoidAllPools) { if (avoidAllHosts || avoidAllPools) {