From 85455f6514eae17375bc3b6c6d779fc00019653b Mon Sep 17 00:00:00 2001 From: Min Chen Date: Thu, 14 Feb 2013 18:00:33 -0800 Subject: [PATCH] CLOUDSTACK-1137: force reconnect to a disconnected host throws error. --- server/src/com/cloud/agent/manager/AgentManagerImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java index 62e8acb0642..6bf629f4f0e 100755 --- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java +++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java @@ -1036,6 +1036,11 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager { return false; } + if (host.getStatus() == Status.Disconnected) { + s_logger.info("Host is already disconnected, no work to be done"); + return true; + } + if (host.getStatus() != Status.Up && host.getStatus() != Status.Alert && host.getStatus() != Status.Rebalancing) { s_logger.info("Unable to disconnect host because it is not in the correct state: host=" + hostId + "; Status=" + host.getStatus()); return false;