You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2016/01/16 20:40:36 UTC
[2/4] git commit: updated refs/heads/4.7 to a767407
Fix log message that refers to agent, not host
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/13f1ed7f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/13f1ed7f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/13f1ed7f
Branch: refs/heads/4.7
Commit: 13f1ed7f147f67974102525c1cd9bfc6503e78eb
Parents: 1cc610f
Author: Miguel Ferreira <mi...@me.com>
Authored: Mon Dec 28 11:07:10 2015 +0100
Committer: Miguel Ferreira <mi...@me.com>
Committed: Mon Dec 28 15:56:25 2015 +0100
----------------------------------------------------------------------
.../src/com/cloud/agent/manager/AgentManagerImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/13f1ed7f/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
index 18b01c9..7e6588b 100644
--- a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -1536,7 +1536,7 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl
/*
* Host is in non-operation state, so no investigation and direct put agent to Disconnected
*/
- status_logger.debug("Ping timeout but host " + agentId + " is in resource state of " + resourceState + ", so no investigation");
+ status_logger.debug("Ping timeout but agent " + agentId + " is in resource state of " + resourceState + ", so no investigation");
disconnectWithoutInvestigation(agentId, Event.ShutdownRequested);
} else {
final HostVO host = _hostDao.findById(agentId);
@@ -1546,7 +1546,7 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl
s_logger.warn("Disconnect agent for CPVM/SSVM due to physical connection close. host: " + host.getId());
disconnectWithoutInvestigation(agentId, Event.ShutdownRequested);
} else {
- status_logger.debug("Ping timeout for host " + agentId + ", do invstigation");
+ status_logger.debug("Ping timeout for agent " + agentId + ", do invstigation");
disconnectWithInvestigation(agentId, Event.PingTimeout);
}
}