From 267216e18e791d293787a91e4ea3eaefc2dc33fa Mon Sep 17 00:00:00 2001 From: frank Date: Wed, 26 Oct 2011 17:01:33 -0700 Subject: [PATCH] Bug 11522 - New agent manager better debug message --- .../cloud/agent/manager/AgentManagerImpl.java | 4 +-- .../src/com/cloud/host/dao/HostDaoImpl.java | 33 ++++++++++++------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java index 87792f60eb9..605300c93a5 100755 --- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java +++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java @@ -1588,7 +1588,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager { StringBuilder msg = new StringBuilder("Transition:"); msg.append("[Resource state = ").append(state); msg.append(", Agent event = ").append(e.toString()); - msg.append(", Host id = ").append(host.getId()).append("]"); + msg.append(", Host id = ").append(host.getId()).append(", name = " + host.getName()).append("]"); status_logger.debug(msg); } @@ -1596,7 +1596,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager { try { return _statusStateMachine.transitTo(host, e, host.getId(), _hostDao); } catch (NoTransitionException e1) { - status_logger.debug("Cannot transit agent status with event " + e + " for host " + host.getId() + ", mangement server id is " + msId); + status_logger.debug("Cannot transit agent status with event " + e + " for host " + host.getId() + ", name=" + host.getName()+ ", mangement server id is " + msId); throw new CloudRuntimeException("Cannot transit agent status with event " + e + " for host " + host.getId() + ", mangement server id is " + msId + "," + e1.getMessage()); } } diff --git a/server/src/com/cloud/host/dao/HostDaoImpl.java b/server/src/com/cloud/host/dao/HostDaoImpl.java index 84ae057e058..d33d3826136 100755 --- a/server/src/com/cloud/host/dao/HostDaoImpl.java +++ b/server/src/com/cloud/host/dao/HostDaoImpl.java @@ -69,6 +69,7 @@ import com.cloud.utils.exception.CloudRuntimeException; public class HostDaoImpl extends GenericDaoBase implements HostDao { private static final Logger s_logger = Logger.getLogger(HostDaoImpl.class); private static final Logger status_logger = Logger.getLogger(Status.class); + private static final Logger state_logger = Logger.getLogger(ResourceState.class); protected final SearchBuilder TypePodDcStatusSearch; @@ -635,7 +636,8 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao assert ho != null : "How how how? : " + host.getId(); StringBuilder str = new StringBuilder("Unable to update host for event:").append(event.toString()); - str.append(". New=[status=").append(newStatus.toString()).append(":msid=") + str.append(". Name=").append(host.getName()); + str.append("; New=[status=").append(newStatus.toString()).append(":msid=") .append(newStatus.lostConnection() ? "null" : host.getManagementServerId()).append(":lastpinged=").append(host.getLastPinged()).append("]"); str.append("; Old=[status=").append(oldStatus.toString()).append(":msid=").append(host.getManagementServerId()).append(":lastpinged=") .append(oldPingTime).append("]"); @@ -644,7 +646,8 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao status_logger.debug(str.toString()); } else { StringBuilder msg = new StringBuilder("Agent status update: ["); - msg.append("hostId = " + host.getId()); + msg.append("id = " + host.getId()); + msg.append("; name = " + host.getName()); msg.append("; old status = " + oldStatus); msg.append("; event = " + event); msg.append("; new status = " + newStatus); @@ -674,20 +677,26 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao int result = update(ub, sc, null); assert result <= 1 : "How can this update " + result + " rows? "; - if (s_logger.isDebugEnabled() && result == 0) { + if (state_logger.isDebugEnabled() && result == 0) { HostVO ho = findById(host.getId()); assert ho != null : "How how how? : " + host.getId(); - StringBuilder str = new StringBuilder("Unable to update resource state for event:").append(event.toString()); - /*TODO: add defbug info*/ + StringBuilder str = new StringBuilder("Unable to update resource state: ["); + str.append("m = " + host.getId()); + str.append("; name = " + host.getName()); + str.append("; old state = " + oldState); + str.append("; event = " + event); + str.append("; new state = " + newState + "]"); + state_logger.debug(str.toString()); + } else { + StringBuilder msg = new StringBuilder("Resource state update: ["); + msg.append("id = " + host.getId()); + msg.append("; name = " + host.getName()); + msg.append("; old state = " + oldState); + msg.append("; event = " + event); + msg.append("; new state = " + newState + "]"); + state_logger.debug(msg.toString()); } - - StringBuilder msg = new StringBuilder("Resource state update: ["); - msg.append("hostId = " + host.getId()); - msg.append("; old state = " + oldState); - msg.append("; event = " + event); - msg.append("; new status = " + newState + "]"); - s_logger.debug(msg.toString()); return result > 0; }