etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "recreate router if failed" 

This reverts commit 0f4ffd8897.

Conflicts:

	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
This commit is contained in:
Edison Su 2012-08-20 10:42:12 -07:00
parent e8d343ab81
commit 7d0d04946b
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
View File

@ -742,6 +742,12 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene
if (vm.getHypervisorType() != HypervisorType.BareMetal) {
_storageMgr.prepare(vmProfile, dest);
}
//since StorageMgr succeeded in volume creation, resue Volume for further tries until current cluster has capacity
if(!reuseVolume){
reuseVolume = true;
}
vmGuru.finalizeVirtualMachineProfile(vmProfile, dest, ctx);
VirtualMachineTO vmTO = hvGuru.implement(vmProfile);