Updated Branches: refs/heads/disk_io_throttling 8b8a0d397 -> 02e5cb3e9
checkout UserVmManagerImpl.java and VirtualMachineManagerImpl.java from master branch Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/02e5cb3e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/02e5cb3e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/02e5cb3e Branch: refs/heads/disk_io_throttling Commit: 02e5cb3e93bc9f0b4bf238b9e9090796a41798bd Parents: 8b8a0d3 Author: Wei Zhou <w.z...@leaseweb.com> Authored: Mon Jun 10 19:53:40 2013 +0200 Committer: Wei Zhou <w.z...@leaseweb.com> Committed: Mon Jun 10 19:53:40 2013 +0200 ---------------------------------------------------------------------- server/src/com/cloud/vm/UserVmManagerImpl.java | 3 --- server/src/com/cloud/vm/VirtualMachineManagerImpl.java | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/02e5cb3e/server/src/com/cloud/vm/UserVmManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index ebf8056..b919f12 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -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()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/02e5cb3e/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 971de56..568fe55 100755 --- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -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);
