cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject [2/2] git commit: updated refs/heads/4.5 to 8b83417
Date Tue, 21 Oct 2014 17:31:58 GMT
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.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8b834171
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8b834171
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8b834171

Branch: refs/heads/4.5
Commit: 8b834171b65ee7de9b8c4d5f22ee71592fee867e
Parents: 6d22ff1
Author: Edison Su <sudison@gmail.com>
Authored: Tue Oct 21 10:17:11 2014 -0700
Committer: Edison Su <sudison@gmail.com>
Committed: Tue Oct 21 10:17:11 2014 -0700

----------------------------------------------------------------------
 agent/src/com/cloud/agent/Agent.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8b834171/agent/src/com/cloud/agent/Agent.java
----------------------------------------------------------------------
diff --git a/agent/src/com/cloud/agent/Agent.java b/agent/src/com/cloud/agent/Agent.java
index 7d5f7b1..8a34333 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;
             }
 


Mime
View raw message