cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prachida...@apache.org
Subject git commit: updated refs/heads/master to 463a3ab
Date Thu, 18 Jul 2013 22:33:36 GMT
Updated Branches:
  refs/heads/master 694b90f7f -> 463a3aba7


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.

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


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

Branch: refs/heads/master
Commit: 463a3aba7185033ff54644fc8c7644570e85cedc
Parents: 694b90f
Author: Prachi Damle <prachi@cloud.com>
Authored: Thu Jul 18 00:26:38 2013 -0700
Committer: Prachi Damle <prachi@cloud.com>
Committed: Thu Jul 18 15:32:30 2013 -0700

----------------------------------------------------------------------
 .../engine/cloud/entity/api/VMEntityManagerImpl.java      | 10 ++++++++--
 server/src/com/cloud/vm/VirtualMachineManagerImpl.java    |  7 ++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/463a3aba/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java
----------------------------------------------------------------------
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
index 0822b92..6dd5844 100755
--- 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 class VMEntityManagerImpl implements VMEntityManager {
                     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 class VMEntityManagerImpl implements VMEntityManager {
                         _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

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/463a3aba/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 9962f03..7a4bf50 100755
--- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -784,10 +784,11 @@ public class VirtualMachineManagerImpl extends ManagerBase implements
VirtualMac
         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 class VirtualMachineManagerImpl extends ManagerBase implements
VirtualMac
                     }
                 }
             }
+
+            if (planToDeploy != null) {
+                planToDeploy.setAvoids(avoids);
+            }
         }
 
         if (startedVm == null) {


Mime
View raw message