Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 39B5E10912 for ; Thu, 6 Mar 2014 00:50:58 +0000 (UTC) Received: (qmail 22053 invoked by uid 500); 6 Mar 2014 00:50:52 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 21987 invoked by uid 500); 6 Mar 2014 00:50:50 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 21907 invoked by uid 99); 6 Mar 2014 00:50:48 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Mar 2014 00:50:48 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 011399381AE; Thu, 6 Mar 2014 00:50:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anthonyxu@apache.org To: commits@cloudstack.apache.org Message-Id: <9a4b81e77f634f83b463abdb8fb9890c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 370554e Date: Thu, 6 Mar 2014 00:50:47 +0000 (UTC) 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 Authored: Wed Mar 5 16:48:40 2014 -0800 Committer: Anthony Xu 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()) {