From 8b834171b65ee7de9b8c4d5f22ee71592fee867e Mon Sep 17 00:00:00 2001 From: Edison Su Date: Tue, 21 Oct 2014 10:17:11 -0700 Subject: [PATCH] Revert "There are few cases that mgt server won't reponse agent's pingcommand timely, or in KVM's case, libvirt won't repsonse in few mintues, which will cause agent reconnect to mgt server, then all the on going tasks on host will fail" This reverts commit f3e91bf26acaeb1202e1fa84b70ad24db3a0eace. --- agent/src/com/cloud/agent/Agent.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/agent/src/com/cloud/agent/Agent.java b/agent/src/com/cloud/agent/Agent.java index 7d5f7b1d7d9..8a3433304dc 100755 --- a/agent/src/com/cloud/agent/Agent.java +++ b/agent/src/com/cloud/agent/Agent.java @@ -578,7 +578,9 @@ public class Agent implements HandlerFactory, IAgentControl { final Object obj = task.get(); if (obj instanceof Response) { if ((System.currentTimeMillis() - _lastPingResponseTime) > _pingInterval * _shell.getPingRetries()) { - s_logger.error("Ping Interval has gone past " + _pingInterval * _shell.getPingRetries() + ". Won't reconnect to mgt server, as connection is still alive"); + s_logger.error("Ping Interval has gone past " + _pingInterval * _shell.getPingRetries() + ". Attempting to reconnect."); + final Link link = task.getLink(); + reconnect(link); return; }