From 024603ddb6e7fcc9aaffab1f6c9d608eebe0d5d0 Mon Sep 17 00:00:00 2001
From: Alex Huang <alex@cloud.com>
Date: Mon, 13 Jun 2011 16:31:39 -0700
Subject: [PATCH] fixes a bug  when on deploy vm, if the first host chosen has
 problem then the deploy failed

---
 .../cloud/vm/VirtualMachineManagerImpl.java   | 51 +++++++++----------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 9052eedb695..f562c23468f 100755
--- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -588,36 +588,35 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene
         try {
             Journal journal = start.second().getJournal();
 
-            // edit plan if this vm's ROOT volume is in READY state already
-            List<VolumeVO> vols = _volsDao.findReadyRootVolumesByInstance(vm.getId());
-
-            for (VolumeVO vol : vols) {
-                // make sure if the templateId is unchanged. If it is changed, let planner
-                // reassign pool for the volume even if it ready.
-                Long volTemplateId = vol.getTemplateId();
-                if (volTemplateId != null && volTemplateId.longValue() != template.getId()) {
-                    if (s_logger.isDebugEnabled()) {
-                        s_logger.debug(vol + " of " + vm + " is READY, but template ids don't match, let the planner reassign a new pool");
-                    }
-                    continue;
-                }
-
-                StoragePoolVO pool = _storagePoolDao.findById(vol.getPoolId());
-                if (!pool.isInMaintenance()) {
-                    long rootVolDcId = pool.getDataCenterId();
-                    Long rootVolPodId = pool.getPodId();
-                    Long rootVolClusterId = pool.getClusterId();
-                    plan = new DataCenterDeployment(rootVolDcId, rootVolPodId, rootVolClusterId, null, vol.getPoolId());
-                    if (s_logger.isDebugEnabled()) {
-                        s_logger.debug(vol + " is ready, changing deployment plan to use this pool's dcId: " + rootVolDcId + " , podId: " + rootVolPodId + " , and clusterId: " + rootVolClusterId);
-                    }
-                }
-            }
-
             ExcludeList avoids = new ExcludeList();
             int retry = _retry;
             while (retry-- != 0) { // It's != so that it can match -1.
+                // edit plan if this vm's ROOT volume is in READY state already
+                List<VolumeVO> vols = _volsDao.findReadyRootVolumesByInstance(vm.getId());
 
+                for (VolumeVO vol : vols) {
+                    // make sure if the templateId is unchanged. If it is changed, let planner
+                    // reassign pool for the volume even if it ready.
+                    Long volTemplateId = vol.getTemplateId();
+                    if (volTemplateId != null && volTemplateId.longValue() != template.getId()) {
+                        if (s_logger.isDebugEnabled()) {
+                            s_logger.debug(vol + " of " + vm + " is READY, but template ids don't match, let the planner reassign a new pool");
+                        }
+                        continue;
+                    }
+
+                    StoragePoolVO pool = _storagePoolDao.findById(vol.getPoolId());
+                    if (!pool.isInMaintenance()) {
+                        long rootVolDcId = pool.getDataCenterId();
+                        Long rootVolPodId = pool.getPodId();
+                        Long rootVolClusterId = pool.getClusterId();
+                        plan = new DataCenterDeployment(rootVolDcId, rootVolPodId, rootVolClusterId, null, vol.getPoolId());
+                        if (s_logger.isDebugEnabled()) {
+                            s_logger.debug(vol + " is ready, changing deployment plan to use this pool's dcId: " + rootVolDcId + " , podId: " + rootVolPodId + " , and clusterId: " + rootVolClusterId);
+                        }
+                    }
+                }
+                
                 VirtualMachineProfileImpl<T> vmProfile = new VirtualMachineProfileImpl<T>(vm, template, offering, account, params);
                 DeployDestination dest = null;
                 for (DeploymentPlanner planner : _planners) {