You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2014/11/18 09:42:35 UTC
[3/4] git commit: updated refs/heads/4.5 to bcc2038
CLOUDSTACK-7703, CLOUDSTACK-7752: Fixed deployment planner stuck in infinite loop.
If we create VM with shared service offering and attach disk with local disk offering,
and one of storage pool is full(cannot be allocated) and other is not full then
we are not putting the cluster in avoid list which is causing this infinite loop.
Fixed by putting the cluster in avoid list even if one of the storage pool is full(cannot be allocated)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ae199b6c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ae199b6c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ae199b6c
Branch: refs/heads/4.5
Commit: ae199b6ce7634ef702243c20800937c8a3ab4b14
Parents: c04cdae
Author: Anshul Gangwar <an...@citrix.com>
Authored: Mon Oct 20 16:04:25 2014 +0530
Committer: Rajesh Battala <ra...@citrix.com>
Committed: Tue Nov 18 14:12:45 2014 +0530
----------------------------------------------------------------------
.../deploy/DeploymentPlanningManagerImpl.java | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ae199b6c/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
index ca66403..e8cf11f 100755
--- a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
+++ b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@ -120,6 +120,7 @@ import com.cloud.utils.db.TransactionCallback;
import com.cloud.utils.db.TransactionStatus;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.fsm.StateListener;
+import com.cloud.utils.fsm.StateMachine2;
import com.cloud.vm.DiskProfile;
import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.VirtualMachine;
@@ -982,7 +983,10 @@ StateListener<State, VirtualMachine.Event, VirtualMachine> {
// if all hosts or all pools in the cluster are in avoid set after this
// pass, then put the cluster in avoid set.
- boolean avoidAllHosts = true, avoidAllPools = true;
+ boolean avoidAllHosts = true;
+ boolean avoidAllPools = true;
+ boolean avoidAllLocalPools = true;
+ boolean avoidAllSharedPools = true;
List<HostVO> allhostsInCluster =
_hostDao.listAllUpAndEnabledNonHAHosts(Host.Type.Routing, clusterVO.getId(), clusterVO.getPodId(), clusterVO.getDataCenterId(), null);
@@ -1016,7 +1020,7 @@ StateListener<State, VirtualMachine.Event, VirtualMachine> {
for (StoragePoolVO pool : allPoolsInCluster) {
if (!allocatorAvoidOutput.shouldAvoid(pool)) {
// there's some pool in the cluster that is not yet in avoid set
- avoidAllPools = false;
+ avoidAllSharedPools = false;
break;
}
}
@@ -1030,11 +1034,19 @@ StateListener<State, VirtualMachine.Event, VirtualMachine> {
if (!allocatorAvoidOutput.shouldAvoid(pool)) {
// there's some pool in the cluster that is not yet
// in avoid set
- avoidAllPools = false;
+ avoidAllLocalPools = false;
break;
}
}
}
+
+ if (vmRequiresSharedStorage && vmRequiresLocalStorege) {
+ avoidAllPools = (avoidAllLocalPools || avoidAllSharedPools) ? true : false;
+ } else if (vmRequiresSharedStorage) {
+ avoidAllPools = avoidAllSharedPools;
+ } else if (vmRequiresLocalStorege) {
+ avoidAllPools = avoidAllLocalPools;
+ }
}
if (avoidAllHosts || avoidAllPools) {