CLOUDSTACK-3451 Parallel deployment - Xenserver - When deploying 30 Vms in parallel, some of the Vm deployment fails when “applying dhcp entry/applying userdata and password entry on router” and retry eventually happens when they succeed.

Prachi Damle · Prachi Damle · commit 463a3aba7185 · 2013-07-18T15:32:30.000-07:00
Changes:
- Passing the avoid set generated by the first pass of deployment to the second try.
- The second try is done, when the first pass that uses a reserved plan fails to deploy on the reserved host, to search over the entire zone again
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java
@@ -115,6 +115,7 @@ public class VMEntityManagerImpl implements VMEntityManager {
     @Inject
     protected AffinityGroupVMMapDao _affinityGroupVMMapDao;
 
+
 	@Override
 	public VMEntityVO loadVirtualMachine(String vmId) {
 		// TODO Auto-generated method stub
@@ -197,7 +198,6 @@ public String reserveVirtualMachine(VMEntityVO vmEntityVO, String plannerToUse,
                     if (s_logger.isDebugEnabled()) {
                         s_logger.debug("Cannot finalize the VM reservation for this destination found, retrying");
                     }
-
                     exclude.addHost(dest.getHost().getId());
                     continue;
                 }
@@ -228,8 +228,14 @@ public void deployVirtualMachine(String reservationId, VMEntityVO vmEntityVO, St
                         _accountDao.findById(vm.getAccountId()), reservedPlan);
             } catch (Exception ex) {
                 // Retry the deployment without using the reservation plan
+                DataCenterDeployment plan = new DataCenterDeployment(0, null, null, null, null, null);
+
+                if (reservedPlan.getAvoids() != null) {
+                    plan.setAvoids(reservedPlan.getAvoids());
+                }
+
                 _itMgr.start(vm, params, _userDao.findById(new Long(caller)), _accountDao.findById(vm.getAccountId()),
-                        null);
+                        plan);
             }
         } else {
             // no reservation found. Let VirtualMachineManager retry
diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -784,10 +784,11 @@ public <T extends VMInstanceVO> T advanceStart(T vm, Map<VirtualMachineProfile.P
         HypervisorGuru hvGuru = _hvGuruMgr.getGuru(vm.getHypervisorType());
 
         boolean canRetry = true;
+        ExcludeList avoids = null;
         try {
             Journal journal = start.second().getJournal();
 
-            ExcludeList avoids = null;
+
             if (planToDeploy != null) {
                 avoids = planToDeploy.getAvoids();
             }
@@ -1025,6 +1026,10 @@ public <T extends VMInstanceVO> T advanceStart(T vm, Map<VirtualMachineProfile.P
                     }
                 }
             }
+
+            if (planToDeploy != null) {
+                planToDeploy.setAvoids(avoids);
+            }
         }
 
         if (startedVm == null) {

Original file line number	Diff line number	Diff line change
`@@ -784,10 +784,11 @@ public <T extends VMInstanceVO> T advanceStart(T vm, Map<VirtualMachineProfile.P`
`784`	`784`	`HypervisorGuru hvGuru = _hvGuruMgr.getGuru(vm.getHypervisorType());`
`785`	`785`
`786`	`786`	`boolean canRetry = true;`
	`787`	`+ ExcludeList avoids = null;`
`787`	`788`	`try {`
`788`	`789`	`Journal journal = start.second().getJournal();`
`789`	`790`
`790`		`- ExcludeList avoids = null;`
	`791`	`+`
`791`	`792`	`if (planToDeploy != null) {`
`792`	`793`	`avoids = planToDeploy.getAvoids();`
`793`	`794`	`}`
`@@ -1025,6 +1026,10 @@ public <T extends VMInstanceVO> T advanceStart(T vm, Map<VirtualMachineProfile.P`
`1025`	`1026`	`}`
`1026`	`1027`	`}`
`1027`	`1028`	`}`
	`1029`	`+`
	`1030`	`+ if (planToDeploy != null) {`
	`1031`	`+ planToDeploy.setAvoids(avoids);`
	`1032`	`+ }`
`1028`	`1033`	`}`
`1029`	`1034`
`1030`	`1035`	`if (startedVm == null) {`