fix CLOUDSTACK-2139 When VM is live migrated to a different host , stopped and started , It starts on the original host where it was before live migration.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7dd88fbb Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7dd88fbb Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7dd88fbb Branch: refs/heads/ui-vm-affinity Commit: 7dd88fbbc6e26097454ff8e387dbcc971d590dc4 Parents: e23d6b2 Author: Mice Xia <mice_...@tcloudcomputing.com> Authored: Tue Apr 23 14:26:28 2013 +0800 Committer: Mice Xia <mice_...@tcloudcomputing.com> Committed: Tue Apr 23 14:27:03 2013 +0800 ---------------------------------------------------------------------- .../com/cloud/vm/VirtualMachineManagerImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7dd88fbb/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 b613917..c1f3f15 100755 --- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -1159,7 +1159,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac _workDao.update(work.getId(), work); } - return stateTransitTo(vm, Event.OperationSucceeded, null, null); + return stateTransitTo(vm, Event.OperationSucceeded, null); } catch (NoTransitionException e) { s_logger.warn(e.getMessage()); return false;
