apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change cluster profiling log level to DEBUG, add more profilers to cluster peer-scan processing

Browse Source
This commit is contained in:
Kelven Yang 2012-01-11 14:27:15 -08:00
parent 45f9701c63
commit bcd58e3ae3
1 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
server/src/com/cloud/cluster/ClusterManagerImpl.java
View File

@ -665,10 +665,11 @@ public class ClusterManagerImpl implements ClusterManager {
profiler.stop(); profiler.stop();
if(profiler.getDuration() >= _heartbeatInterval) { if(profiler.getDuration() >= _heartbeatInterval) {
s_logger.warn("Management server heartbeat takes too long to finish. profiler: " + profiler.toString() + if(s_logger.isDebugEnabled())
", profilerHeartbeatUpdate: " + profilerHeartbeatUpdate.toString() + s_logger.debug("Management server heartbeat takes too long to finish. profiler: " + profiler.toString() +
", profilerPeerScan: " + profilerPeerScan.toString() + ", profilerHeartbeatUpdate: " + profilerHeartbeatUpdate.toString() +
", profilerAgentLB: " + profilerAgentLB.toString()); ", profilerPeerScan: " + profilerPeerScan.toString() +
", profilerAgentLB: " + profilerAgentLB.toString());
} }
} }
@ -884,8 +885,16 @@ public class ClusterManagerImpl implements ClusterManager {
private void peerScan() throws ActiveFencingException { private void peerScan() throws ActiveFencingException {
Date cutTime = DateUtil.currentGMTTime(); Date cutTime = DateUtil.currentGMTTime();
List<ManagementServerHostVO> currentList = _mshostDao.getActiveList(new Date(cutTime.getTime() - _heartbeatThreshold)); Profiler profiler = new Profiler();
profiler.start();
Profiler profilerQueryActiveList = new Profiler();
profilerQueryActiveList.start();
List<ManagementServerHostVO> currentList = _mshostDao.getActiveList(new Date(cutTime.getTime() - _heartbeatThreshold));
profilerQueryActiveList.stop();
Profiler profilerSyncClusterInfo = new Profiler();
profilerSyncClusterInfo.start();
List<ManagementServerHostVO> removedNodeList = new ArrayList<ManagementServerHostVO>(); List<ManagementServerHostVO> removedNodeList = new ArrayList<ManagementServerHostVO>();
List<ManagementServerHostVO> invalidatedNodeList = new ArrayList<ManagementServerHostVO>(); List<ManagementServerHostVO> invalidatedNodeList = new ArrayList<ManagementServerHostVO>();
@ -928,7 +937,10 @@ public class ClusterManagerImpl implements ClusterManager {
} }
} }
} }
profilerSyncClusterInfo.stop();
Profiler profilerInvalidatedNodeList = new Profiler();
profilerInvalidatedNodeList.start();
// process invalidated node list // process invalidated node list
if(invalidatedNodeList.size() > 0) { if(invalidatedNodeList.size() > 0) {
for(ManagementServerHostVO mshost : invalidatedNodeList) { for(ManagementServerHostVO mshost : invalidatedNodeList) {
@ -942,7 +954,10 @@ public class ClusterManagerImpl implements ClusterManager {
this.queueNotification(new ClusterManagerMessage(ClusterManagerMessage.MessageType.nodeRemoved, invalidatedNodeList)); this.queueNotification(new ClusterManagerMessage(ClusterManagerMessage.MessageType.nodeRemoved, invalidatedNodeList));
} }
profilerInvalidatedNodeList.stop();
Profiler profilerRemovedList = new Profiler();
profilerRemovedList.start();
// process removed node list // process removed node list
Iterator<ManagementServerHostVO> it = removedNodeList.iterator(); Iterator<ManagementServerHostVO> it = removedNodeList.iterator();
while(it.hasNext()) { while(it.hasNext()) {
@ -964,6 +979,7 @@ public class ClusterManagerImpl implements ClusterManager {
if(removedNodeList.size() > 0) { if(removedNodeList.size() > 0) {
this.queueNotification(new ClusterManagerMessage(ClusterManagerMessage.MessageType.nodeRemoved, removedNodeList)); this.queueNotification(new ClusterManagerMessage(ClusterManagerMessage.MessageType.nodeRemoved, removedNodeList));
} }
profilerRemovedList.stop();
List<ManagementServerHostVO> newNodeList = new ArrayList<ManagementServerHostVO>(); List<ManagementServerHostVO> newNodeList = new ArrayList<ManagementServerHostVO>();
for(ManagementServerHostVO mshost : currentList) { for(ManagementServerHostVO mshost : currentList) {
@ -986,6 +1002,17 @@ public class ClusterManagerImpl implements ClusterManager {
if(newNodeList.size() > 0) { if(newNodeList.size() > 0) {
this.queueNotification(new ClusterManagerMessage(ClusterManagerMessage.MessageType.nodeAdded, newNodeList)); this.queueNotification(new ClusterManagerMessage(ClusterManagerMessage.MessageType.nodeAdded, newNodeList));
} }
profiler.stop();
if(profiler.getDuration() >= this._heartbeatInterval) {
if(s_logger.isDebugEnabled())
s_logger.debug("Peer scan takes too long to finish. profiler: " + profiler.toString()
+ ", profilerQueryActiveList: " + profilerQueryActiveList.toString()
+ ", profilerSyncClusterInfo: " + profilerSyncClusterInfo.toString()
+ ", profilerInvalidatedNodeList: " + profilerInvalidatedNodeList.toString()
+ ", profilerRemovedList: " + profilerRemovedList.toString());
}
} }
private static ManagementServerHostVO getInListById(Long id, List<ManagementServerHostVO> l) { private static ManagementServerHostVO getInListById(Long id, List<ManagementServerHostVO> l) {