Repository: cloudstack Updated Branches: refs/heads/master 830328b63 -> 370554e9d
only ping timeout trigger host HA, otherwise there may be two threads try to HA the same VM Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/370554e9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/370554e9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/370554e9 Branch: refs/heads/master Commit: 370554e9d99effa3ff2b534a4bdbdfe8e312a29f Parents: 830328b Author: Anthony Xu <[email protected]> Authored: Wed Mar 5 16:48:40 2014 -0800 Committer: Anthony Xu <[email protected]> Committed: Wed Mar 5 16:50:33 2014 -0800 ---------------------------------------------------------------------- .../src/com/cloud/agent/manager/DirectAgentAttache.java | 2 -- 1 file changed, 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/370554e9/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java ---------------------------------------------------------------------- diff --git a/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java b/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java index 354da4b..9874ee4 100755 --- a/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java +++ b/engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java @@ -34,7 +34,6 @@ import com.cloud.agent.transport.Request; import com.cloud.agent.transport.Response; import com.cloud.exception.AgentUnavailableException; import com.cloud.host.Status; -import com.cloud.host.Status.Event; import com.cloud.resource.ServerResource; public class DirectAgentAttache extends AgentAttache { @@ -145,7 +144,6 @@ public class DirectAgentAttache extends AgentAttache { PingCommand cmd = resource.getCurrentStatus(_id); if (cmd == null) { s_logger.warn("Unable to get current status on " + _id + "(" + _name + ")"); - _mgr.disconnectWithInvestigation(DirectAgentAttache.this, Event.AgentDisconnected); return; } if (s_logger.isDebugEnabled()) {
