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

checkout UserVmManagerImpl.java and VirtualMachineManagerImpl.java from master branch

This commit is contained in:
Wei Zhou 2013-06-10 19:53:40 +02:00
parent 8b8a0d3975
commit 02e5cb3e93
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -3380,9 +3380,6 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use
boolean status;
State vmState = vm.getState();
// Collect vm disk statistics from host before stopping Vm
collectVmDiskStatistics(vm);
try {
VirtualMachineEntity vmEntity = _orchSrvc.getVirtualMachine(vm.getUuid());
status = vmEntity.destroy(new Long(userId).toString());

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

@ -1328,7 +1328,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
throw new CloudRuntimeException("Unable to migrate vm: " + e.toString());
}
VirtualMachineProfile<T> profile = new VirtualMachineProfileImpl<T>(vm);
VirtualMachineProfile<VMInstanceVO> profile = new VirtualMachineProfileImpl<VMInstanceVO>(vm);
boolean migrationResult = false;
try {
migrationResult = this.volumeMgr.storageMigration(profile, destPool);