cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sate...@apache.org
Subject [40/50] [abbrv] git commit: updated refs/heads/vmware-datamodel to f1a5d70
Date Thu, 23 May 2013 07:25:45 GMT
- To check if a host is in avoid set, DPM should check the zones/pods/cluster/hosts in teh
avoid list - not just the hosts in avoid list.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a69101dc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a69101dc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a69101dc

Branch: refs/heads/vmware-datamodel
Commit: a69101dceb535af2d6c6382b83d26f14d4ef03bf
Parents: c52879b
Author: Prachi Damle <prachi@cloud.com>
Authored: Wed May 22 16:17:14 2013 -0700
Committer: Prachi Damle <prachi@cloud.com>
Committed: Wed May 22 17:06:49 2013 -0700

----------------------------------------------------------------------
 .../deploy/DeploymentPlanningManagerImpl.java      |   24 +++++---------
 1 files changed, 9 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a69101dc/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 c86d5e1..795b526 100644
--- a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
+++ b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@ -380,7 +380,7 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements
Deploy
 
                 if (planner instanceof DeploymentClusterPlanner) {
 
-                    ExcludeList PlannerAvoidInput = new ExcludeList(avoids.getDataCentersToAvoid(),
+                    ExcludeList plannerAvoidInput = new ExcludeList(avoids.getDataCentersToAvoid(),
                             avoids.getPodsToAvoid(), avoids.getClustersToAvoid(), avoids.getHostsToAvoid(),
                             avoids.getPoolsToAvoid());
 
@@ -388,19 +388,19 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements
Deploy
 
                     if (clusterList != null && !clusterList.isEmpty()) {
                         // planner refactoring. call allocators to list hosts
-                        ExcludeList PlannerAvoidOutput = new ExcludeList(avoids.getDataCentersToAvoid(),
+                        ExcludeList plannerAvoidOutput = new ExcludeList(avoids.getDataCentersToAvoid(),
                                 avoids.getPodsToAvoid(), avoids.getClustersToAvoid(), avoids.getHostsToAvoid(),
                                 avoids.getPoolsToAvoid());
 
-                        resetAvoidSet(PlannerAvoidOutput, PlannerAvoidInput);
+                        resetAvoidSet(plannerAvoidOutput, plannerAvoidInput);
 
                         dest = checkClustersforDestination(clusterList, vmProfile, plan,
avoids, dc,
-                                getPlannerUsage(planner), PlannerAvoidOutput);
+                                getPlannerUsage(planner), plannerAvoidOutput);
                         if (dest != null) {
                             return dest;
                         }
                         // reset the avoid input to the planners
-                        resetAvoidSet(avoids, PlannerAvoidOutput);
+                        resetAvoidSet(avoids, plannerAvoidOutput);
 
                     } else {
                         return null;
@@ -815,12 +815,8 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements
Deploy
 
         // remove any hosts/pools that the planners might have added
         // to get the list of hosts/pools that Allocators flagged as 'avoid'
-        if (allocatorAvoidOutput.getHostsToAvoid() != null && plannerAvoidOutput.getHostsToAvoid()
!= null) {
-            allocatorAvoidOutput.getHostsToAvoid().removeAll(plannerAvoidOutput.getHostsToAvoid());
-        }
-        if (allocatorAvoidOutput.getPoolsToAvoid() != null && plannerAvoidOutput.getPoolsToAvoid()
!= null) {
-            allocatorAvoidOutput.getPoolsToAvoid().removeAll(plannerAvoidOutput.getPoolsToAvoid());
-        }
+
+        resetAvoidSet(allocatorAvoidOutput, plannerAvoidOutput);
 
         // if all hosts or all pools in the cluster are in avoid set after this
         // pass, then put the cluster in avoid set.
@@ -829,8 +825,7 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements
Deploy
         List<HostVO> allhostsInCluster = _hostDao.listAllUpAndEnabledNonHAHosts(Host.Type.Routing,
clusterVO.getId(),
                 clusterVO.getPodId(), clusterVO.getDataCenterId(), null);
         for (HostVO host : allhostsInCluster) {
-            if (allocatorAvoidOutput.getHostsToAvoid() == null
-                    || !allocatorAvoidOutput.getHostsToAvoid().contains(host.getId())) {
+            if (!allocatorAvoidOutput.shouldAvoid(host)) {
                 // there's some host in the cluster that is not yet in avoid set
                 avoidAllHosts = false;
             }
@@ -839,8 +834,7 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements
Deploy
         List<StoragePoolVO> allPoolsInCluster = _storagePoolDao.findPoolsByTags(clusterVO.getDataCenterId(),
                 clusterVO.getPodId(), clusterVO.getId(), null);
         for (StoragePoolVO pool : allPoolsInCluster) {
-            if (allocatorAvoidOutput.getPoolsToAvoid() == null
-                    || !allocatorAvoidOutput.getPoolsToAvoid().contains(pool.getId())) {
+            if (!allocatorAvoidOutput.shouldAvoid(pool)) {
                 // there's some pool in the cluster that is not yet in avoid set
                 avoidAllPools = false;
             }


Mime
View raw message