From 9e4bfca02774b26c11eda4882c7adf583dfd368a Mon Sep 17 00:00:00 2001 From: frank Date: Wed, 6 Jun 2012 14:05:54 -0700 Subject: [PATCH] CloudStack CS-15244 Not able to put the host in maintenance mode when one of the host in the cluster has host tag and the other host does not have a host tag. We are also not able to cancel the Maintenance mode. fixed reviewed-by: edison --- api/src/com/cloud/resource/ResourceState.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/api/src/com/cloud/resource/ResourceState.java b/api/src/com/cloud/resource/ResourceState.java index cd4afc93738..41c54c62e3f 100755 --- a/api/src/com/cloud/resource/ResourceState.java +++ b/api/src/com/cloud/resource/ResourceState.java @@ -109,6 +109,8 @@ public enum ResourceState { 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.UnableToMigrate, ResourceState.ErrorInMaintenance); + s_fsm.addTransition(ResourceState.ErrorInMaintenance, Event.AdminCancelMaintenance, ResourceState.Enabled); s_fsm.addTransition(ResourceState.Error, Event.InternalCreated, ResourceState.Error); } }