You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/06/28 01:17:23 UTC
git commit: updated refs/heads/vmsync to b7d61f0
Updated Branches:
refs/heads/vmsync 422d9b8da -> b7d61f09b
Migration now works
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b7d61f09
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b7d61f09
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b7d61f09
Branch: refs/heads/vmsync
Commit: b7d61f09b92f27f9285a70df758f483c7902c81f
Parents: 422d9b8
Author: Alex Huang <al...@gmail.com>
Authored: Thu Jun 27 16:18:14 2013 -0700
Committer: Alex Huang <al...@gmail.com>
Committed: Thu Jun 27 16:18:14 2013 -0700
----------------------------------------------------------------------
.../src/com/cloud/vm/VirtualMachineManagerImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b7d61f09/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 3ca651f..7a5345d 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -705,7 +705,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
@DB
protected void changeState2(VMInstanceVO vm, VirtualMachine.Event vmEvent, Long hostId, VmWorkJobVO work, VirtualMachine.Event workEvent) throws NoTransitionException {
VmWorkJobVO.Step currentStep = work.getStep();
- StateMachine<Step, Event> sm = work.getCmd() == VmWorkJobDispatcher.Migrate ? MigrationStateMachine : null;
+ StateMachine<Step, Event> sm = VmWorkJobDispatcher.Migrate.equals(work.getCmd()) ? MigrationStateMachine : null;
Transaction txn = Transaction.currentTxn();
@@ -1527,7 +1527,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
VirtualMachineTO to = toVmTO(dstVm);
VmWorkJobVO work = _workJobDao.findById(jc.getJob().getId());
- work.setStep(MigrationStateMachine.getNextState(null, VirtualMachine.Event.MigrationRequested));
+ work.setStep(MigrationStateMachine.getNextState(Step.Filed, VirtualMachine.Event.MigrationRequested));
work = _workJobDao.persist(work);
PrepareForMigrationCommand pfmc = new PrepareForMigrationCommand(to);