Skip to content

Commit 267216e

Browse files
author
frank
committed
Bug 11522 - New agent manager
better debug message
1 parent 1883afe commit 267216e

2 files changed

Lines changed: 23 additions & 14 deletions

File tree

‎server/src/com/cloud/agent/manager/AgentManagerImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1588,15 +1588,15 @@ public boolean agentStatusTransitTo(HostVO host, Status.Event e, long msId) {
15881588
StringBuilder msg = new StringBuilder("Transition:");
15891589
msg.append("[Resource state = ").append(state);
15901590
msg.append(", Agent event = ").append(e.toString());
1591-
msg.append(", Host id = ").append(host.getId()).append("]");
1591+
msg.append(", Host id = ").append(host.getId()).append(", name = " + host.getName()).append("]");
15921592
status_logger.debug(msg);
15931593
}
15941594

15951595
host.setManagementServerId(msId);
15961596
try {
15971597
return _statusStateMachine.transitTo(host, e, host.getId(), _hostDao);
15981598
} catch (NoTransitionException e1) {
1599-
status_logger.debug("Cannot transit agent status with event " + e + " for host " + host.getId() + ", mangement server id is " + msId);
1599+
status_logger.debug("Cannot transit agent status with event " + e + " for host " + host.getId() + ", name=" + host.getName()+ ", mangement server id is " + msId);
16001600
throw new CloudRuntimeException("Cannot transit agent status with event " + e + " for host " + host.getId() + ", mangement server id is " + msId + "," + e1.getMessage());
16011601
}
16021602
}

‎server/src/com/cloud/host/dao/HostDaoImpl.java‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao {
7070
private static final Logger s_logger = Logger.getLogger(HostDaoImpl.class);
7171
private static final Logger status_logger = Logger.getLogger(Status.class);
72+
private static final Logger state_logger = Logger.getLogger(ResourceState.class);
7273

7374
protected final SearchBuilder<HostVO> TypePodDcStatusSearch;
7475

@@ -635,7 +636,8 @@ public boolean updateState(Status oldStatus, Event event, Status newStatus, Host
635636
assert ho != null : "How how how? : " + host.getId();
636637

637638
StringBuilder str = new StringBuilder("Unable to update host for event:").append(event.toString());
638-
str.append(". New=[status=").append(newStatus.toString()).append(":msid=")
639+
str.append(". Name=").append(host.getName());
640+
str.append("; New=[status=").append(newStatus.toString()).append(":msid=")
639641
.append(newStatus.lostConnection() ? "null" : host.getManagementServerId()).append(":lastpinged=").append(host.getLastPinged()).append("]");
640642
str.append("; Old=[status=").append(oldStatus.toString()).append(":msid=").append(host.getManagementServerId()).append(":lastpinged=")
641643
.append(oldPingTime).append("]");
@@ -644,7 +646,8 @@ public boolean updateState(Status oldStatus, Event event, Status newStatus, Host
644646
status_logger.debug(str.toString());
645647
} else {
646648
StringBuilder msg = new StringBuilder("Agent status update: [");
647-
msg.append("hostId = " + host.getId());
649+
msg.append("id = " + host.getId());
650+
msg.append("; name = " + host.getName());
648651
msg.append("; old status = " + oldStatus);
649652
msg.append("; event = " + event);
650653
msg.append("; new status = " + newStatus);
@@ -674,20 +677,26 @@ public boolean updateResourceState(ResourceState oldState, ResourceState.Event e
674677
int result = update(ub, sc, null);
675678
assert result <= 1 : "How can this update " + result + " rows? ";
676679

677-
if (s_logger.isDebugEnabled() && result == 0) {
680+
if (state_logger.isDebugEnabled() && result == 0) {
678681
HostVO ho = findById(host.getId());
679682
assert ho != null : "How how how? : " + host.getId();
680683

681-
StringBuilder str = new StringBuilder("Unable to update resource state for event:").append(event.toString());
682-
/*TODO: add defbug info*/
684+
StringBuilder str = new StringBuilder("Unable to update resource state: [");
685+
str.append("m = " + host.getId());
686+
str.append("; name = " + host.getName());
687+
str.append("; old state = " + oldState);
688+
str.append("; event = " + event);
689+
str.append("; new state = " + newState + "]");
690+
state_logger.debug(str.toString());
691+
} else {
692+
StringBuilder msg = new StringBuilder("Resource state update: [");
693+
msg.append("id = " + host.getId());
694+
msg.append("; name = " + host.getName());
695+
msg.append("; old state = " + oldState);
696+
msg.append("; event = " + event);
697+
msg.append("; new state = " + newState + "]");
698+
state_logger.debug(msg.toString());
683699
}
684-
685-
StringBuilder msg = new StringBuilder("Resource state update: [");
686-
msg.append("hostId = " + host.getId());
687-
msg.append("; old state = " + oldState);
688-
msg.append("; event = " + event);
689-
msg.append("; new status = " + newState + "]");
690-
s_logger.debug(msg.toString());
691700

692701
return result > 0;
693702
}

0 commit comments

Comments
 (0)