CLOUDSTACK-118 Status of host resorce stuck in ErrorInMaintenance

Mice Xia · sudison · commit 06bca1d247fc · 2012-10-16T15:41:45.000-07:00
diff --git a/api/src/com/cloud/resource/ResourceState.java b/api/src/com/cloud/resource/ResourceState.java
@@ -113,6 +113,7 @@ public static String[] toString(ResourceState... states) {
         s_fsm.addTransition(ResourceState.ErrorInMaintenance, Event.Disable, ResourceState.Disabled);
         s_fsm.addTransition(ResourceState.ErrorInMaintenance, Event.DeleteHost, ResourceState.Disabled);
         s_fsm.addTransition(ResourceState.ErrorInMaintenance, Event.InternalEnterMaintenance, ResourceState.Maintenance);
+        s_fsm.addTransition(ResourceState.ErrorInMaintenance, Event.AdminCancelMaintenance, ResourceState.Enabled);
         s_fsm.addTransition(ResourceState.Error, Event.InternalCreated, ResourceState.Error);
     }
 }
diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1995,7 +1995,10 @@ protected Command compareState(long hostId, VMInstanceVO vm, final AgentVmInfo i
             }
             if (vm.getHostId() == null || hostId != vm.getHostId()) {
                 try {
-                    stateTransitTo(vm, VirtualMachine.Event.AgentReportMigrated, hostId);
+                    ItWorkVO workItem = _workDao.findByOutstandingWork(vm.getId(), State.Migrating);
+                    if(workItem == null){
+                        stateTransitTo(vm, VirtualMachine.Event.AgentReportMigrated, hostId);
+                    }
                 } catch (NoTransitionException e) {
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,7 @@ public static String[] toString(ResourceState... states) {`
`113`	`113`	`s_fsm.addTransition(ResourceState.ErrorInMaintenance, Event.Disable, ResourceState.Disabled);`
`114`	`114`	`s_fsm.addTransition(ResourceState.ErrorInMaintenance, Event.DeleteHost, ResourceState.Disabled);`
`115`	`115`	`s_fsm.addTransition(ResourceState.ErrorInMaintenance, Event.InternalEnterMaintenance, ResourceState.Maintenance);`
	`116`	`+ s_fsm.addTransition(ResourceState.ErrorInMaintenance, Event.AdminCancelMaintenance, ResourceState.Enabled);`
`116`	`117`	`s_fsm.addTransition(ResourceState.Error, Event.InternalCreated, ResourceState.Error);`
`117`	`118`	`}`
`118`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1995,7 +1995,10 @@ protected Command compareState(long hostId, VMInstanceVO vm, final AgentVmInfo i`
`1995`	`1995`	`}`
`1996`	`1996`	`if (vm.getHostId() == null \|\| hostId != vm.getHostId()) {`
`1997`	`1997`	`try {`
`1998`		`- stateTransitTo(vm, VirtualMachine.Event.AgentReportMigrated, hostId);`
	`1998`	`+ ItWorkVO workItem = _workDao.findByOutstandingWork(vm.getId(), State.Migrating);`
	`1999`	`+ if(workItem == null){`
	`2000`	`+ stateTransitTo(vm, VirtualMachine.Event.AgentReportMigrated, hostId);`
	`2001`	`+ }`
`1999`	`2002`	`} catch (NoTransitionException e) {`
`2000`	`2003`	`}`
`2001`	`2004`	`}`