etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed all the stats command/answer from debug logging

This commit is contained in:
Alex Huang 2011-02-07 12:50:03 -08:00
parent a502b497f2
commit c6fe6f2f45
16 changed files with 125 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/com/cloud/agent/api/Command.java
View File

@ -32,9 +32,14 @@ public abstract class Command {
protected Command() {
}
@Override
public String toString() {
return this.getClass().getSimpleName();
}
public abstract boolean executeInSequence();
public boolean logTrace() {
return false;
}
}

10
api/src/com/cloud/agent/api/GetFileStatsAnswer.java
View File

@ -19,10 +19,6 @@ package com.cloud.agent.api;
import com.cloud.storage.VolumeStats;
/**
* @author ahuang
*
*/
public class GetFileStatsAnswer extends Answer implements VolumeStats {
long size;
protected GetFileStatsAnswer() {
@ -33,7 +29,13 @@ public class GetFileStatsAnswer extends Answer implements VolumeStats {
size = value;
}
@Override
public long getBytesUsed() {
return size;
}
@Override
public boolean logTrace() {
return true;
}
}

5
api/src/com/cloud/agent/api/GetFileStatsCommand.java
View File

@ -37,4 +37,9 @@ public class GetFileStatsCommand extends Command {
public boolean executeInSequence() {
return false;
}
@Override
public boolean logTrace() {
return true;
}
}

5
api/src/com/cloud/agent/api/GetHostStatsAnswer.java
View File

@ -88,4 +88,9 @@ public class GetHostStatsAnswer extends Answer implements HostStats {
public HostStats getHostStats() {
return hostStats;
}
@Override
public boolean logTrace() {
return true;
}
}

6
api/src/com/cloud/agent/api/GetHostStatsCommand.java
View File

@ -17,7 +17,6 @@
*/
package com.cloud.agent.api;
import java.util.List;
public class GetHostStatsCommand extends Command
{
@ -50,4 +49,9 @@ public class GetHostStatsCommand extends Command
public boolean executeInSequence() {
return false;
}
@Override
public boolean logTrace() {
return true;
}
}

6
api/src/com/cloud/agent/api/GetStorageStatsAnswer.java
View File

@ -27,10 +27,12 @@ public class GetStorageStatsAnswer extends Answer implements StorageStats {
protected long capacity;
@Override
public long getByteUsed() {
return used;
}
@Override
public long getCapacityBytes() {
return capacity;
}
@ -46,4 +48,8 @@ public class GetStorageStatsAnswer extends Answer implements StorageStats {
super(cmd, false, details);
}
@Override
public boolean logTrace() {
return true;
}
}

5
api/src/com/cloud/agent/api/GetStorageStatsCommand.java
View File

@ -63,4 +63,9 @@ public class GetStorageStatsCommand extends Command {
public boolean executeInSequence() {
return false;
}
@Override
public boolean logTrace() {
return true;
}
}

5
api/src/com/cloud/agent/api/GetVmStatsAnswer.java
View File

@ -36,4 +36,9 @@ public class GetVmStatsAnswer extends Answer {
protected GetVmStatsAnswer() {
//no-args constructor for json serialization-deserialization
}
@Override
public boolean logTrace() {
return true;
}
}

7
api/src/com/cloud/agent/api/GetVmStatsCommand.java
View File

@ -19,8 +19,6 @@ package com.cloud.agent.api;
import java.util.List;
import com.cloud.vm.VirtualMachine;
public class GetVmStatsCommand extends Command {
List<String> vmNames;
String hostGuid;
@ -51,4 +49,9 @@ public class GetVmStatsCommand extends Command {
public boolean executeInSequence() {
return false;
}
@Override
public boolean logTrace() {
return true;
}
}

5
api/src/com/cloud/agent/api/NetworkUsageAnswer.java
View File

@ -46,4 +46,9 @@ public class NetworkUsageAnswer extends Answer {
public Long getBytesSent() {
return bytesSent;
}
@Override
public boolean logTrace() {
return true;
}
}

7
api/src/com/cloud/agent/api/NetworkUsageCommand.java
View File

@ -52,12 +52,13 @@ public class NetworkUsageCommand extends Command {
return option;
}
/**
* {@inheritDoc}
*/
@Override
public boolean executeInSequence() {
return false;
}
@Override
public boolean logTrace() {
return true;
}
}

44
core/src/com/cloud/agent/transport/Request.java
View File

@ -29,7 +29,6 @@ import com.cloud.agent.api.Answer;
import com.cloud.agent.api.Command;
import com.cloud.agent.api.SecStorageFirewallCfgCommand.PortConfig;
import com.cloud.exception.UnsupportedVersionException;
import com.cloud.storage.VolumeVO;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.Pair;
import com.cloud.utils.exception.CloudRuntimeException;
@ -93,8 +92,8 @@ public class Request {
s_gBuilder = new GsonBuilder();
s_gBuilder.registerTypeAdapter(Command[].class, new ArrayTypeAdaptor<Command>());
s_gBuilder.registerTypeAdapter(Answer[].class, new ArrayTypeAdaptor<Answer>());
final Type listType = new TypeToken<List<VolumeVO>>() {}.getType();
s_gBuilder.registerTypeAdapter(listType, new VolListTypeAdaptor());
// final Type listType = new TypeToken<List<VolumeVO>>() {}.getType();
// s_gBuilder.registerTypeAdapter(listType, new VolListTypeAdaptor());
s_gBuilder.registerTypeAdapter(new TypeToken<List<PortConfig>>() {}.getType(), new PortConfigListTypeAdaptor());
s_gBuilder.registerTypeAdapter(new TypeToken<Pair<Long, Long>>() {}.getType(), new NwGroupsCommandTypeAdaptor());
s_logger.info("Builder inited.");
@ -303,6 +302,34 @@ public class Request {
protected short getFlags() {
return (short)(((this instanceof Response) ? FLAG_RESPONSE : FLAG_REQUEST) | _flags);
}
public void log(long agentId, String msg) {
if (!s_logger.isDebugEnabled()) {
return;
}
StringBuilder buf = new StringBuilder("Seq ");
buf.append(agentId).append("-").append(_seq).append(": ");
boolean debug = false;
if (_cmds != null) {
for (Command cmd : _cmds) {
if (!cmd.logTrace()) {
debug = true;
break;
}
}
} else {
debug = true;
}
buf.append(msg).append(toString());
if (executeInSequence() || debug) {
s_logger.debug(buf.toString());
} else {
s_logger.trace(buf.toString());
}
}
/**
* Factory method for Request and Response. It expects the bytes to be
@ -392,10 +419,6 @@ public class Request {
}
public static class NwGroupsCommandTypeAdaptor implements JsonDeserializer<Pair<Long, Long>>, JsonSerializer<Pair<Long,Long>> {
static final GsonBuilder s_gBuilder;
static {
s_gBuilder = Request.initBuilder();
}
public NwGroupsCommandTypeAdaptor() {
}
@ -445,12 +468,6 @@ public class Request {
}
public static class PortConfigListTypeAdaptor implements JsonDeserializer<List<PortConfig>>, JsonSerializer<List<PortConfig>> {
static final GsonBuilder s_gBuilder;
static {
s_gBuilder = Request.initBuilder();
}
static final Type listType = new TypeToken<List<PortConfig>>() {}.getType();
public PortConfigListTypeAdaptor() {
}
@ -487,6 +504,5 @@ public class Request {
}
return pcs;
}
}
}

49
server/src/com/cloud/agent/manager/AgentAttache.java
View File

@ -227,13 +227,14 @@ public abstract class AgentAttache {
}
public boolean processAnswers(final long seq, final Response resp) {
if (s_logger.isDebugEnabled()) {
if (!resp.executeInSequence()) {
s_logger.debug(log(seq, "Processing: " + resp.toString()));
} else {
s_logger.trace(log(seq, "Processing: " + resp.toString()));
}
}
resp.log(_id, "Processing: ");
// if (s_logger.isDebugEnabled()) {
// if (!resp.executeInSequence()) {
// s_logger.debug(log(seq, "Processing: " + resp.toString()));
// } else {
// s_logger.trace(log(seq, "Processing: " + resp.toString()));
// }
// }
final Answer[] answers = resp.getAnswers();
@ -313,9 +314,10 @@ public abstract class AgentAttache {
}
if (req.executeInSequence() && _currentSequence != null) {
if (s_logger.isDebugEnabled()) {
s_logger.debug(log(seq, "Waiting for Seq " + _currentSequence + " Scheduling: " + req.toString()));
}
req.log(_id, "Waiting for Seq " + _currentSequence + " Scheduling: ");
// if (s_logger.isDebugEnabled()) {
// s_logger.debug(log(seq, "Waiting for Seq " + _currentSequence + " Scheduling: " + req.toString()));
// }
addRequest(req);
return;
}
@ -323,9 +325,10 @@ public abstract class AgentAttache {
// If we got to here either we're not suppose to set
// the _currentSequence or it is null already.
if (s_logger.isDebugEnabled()) {
s_logger.debug(log(seq, "Sending " + req.toString()));
}
req.log(_id, "Sending ");
// if (s_logger.isDebugEnabled()) {
// s_logger.debug(log(seq, "Sending " + req.toString()));
// }
send(req);
if (req.executeInSequence() && _currentSequence == null) {
@ -362,14 +365,15 @@ public abstract class AgentAttache {
}
if (answers != null) {
if (s_logger.isDebugEnabled()) {
if (req.executeInSequence()) {
s_logger.debug(log(seq, "Received: " + new Response(req, answers).toString()));
} else {
s_logger.debug(log(seq, "Received: "));
if (s_logger.isTraceEnabled()) {
s_logger.trace(log(seq, "Received: " + new Response(req, answers).toString()));
}
}
new Response(req, answers).log(_id, "Received: ");
// if (req.executeInSequence()) {
// s_logger.debug(log(seq, "Received: " + new Response(req, answers).toString()));
// } else {
// s_logger.debug(log(seq, "Received: "));
// if (s_logger.isTraceEnabled()) {
// s_logger.trace(log(seq, "Received: " + new Response(req, answers).toString()));
// }
// }
}
return answers;
}
@ -377,7 +381,8 @@ public abstract class AgentAttache {
answers = sl.getAnswers(); // Try it again.
if (answers != null) {
if (s_logger.isDebugEnabled()) {
s_logger.debug(log(seq, "Received after timeout: " + new Response(req, answers).toString()));
new Response(req, answers).log(_id, "Received after timeout: ");
// s_logger.debug(log(seq, "Received after timeout: " + new Response(req, answers).toString()));
}
return answers;
}

10
server/src/com/cloud/agent/manager/AgentManagerImpl.java
View File

@ -1227,8 +1227,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory,
final AgentAttache agent = getAttache(hostId);
if (agent == null || agent.isClosed()) {
throw new AgentUnavailableException(
"agent not logged into this management server", hostId);
throw new AgentUnavailableException("agent not logged into this management server", hostId);
}
long seq = _hostDao.getNextSequence(hostId);
@ -1684,9 +1683,10 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory,
AgentAttache attache = null;
if (s_logger.isDebugEnabled()) {
s_logger.debug("Startup request from directly connected host: "
+ new Request(0l, -1l, -1l, cmds, true, false, true)
.toString());
new Request(0l, -1l, -1l, cmds, true, false, true).log(-1, "Startup request from directly connected host: ");
// s_logger.debug("Startup request from directly connected host: "
// + new Request(0l, -1l, -1l, cmds, true, false, true)
// .toString());
}
try {
attache = handleDirectConnect(resource, cmds, details, old);

5
server/src/com/cloud/agent/manager/ClusteredAgentAttache.java
View File

@ -141,8 +141,9 @@ public class ClusteredAgentAttache extends ConnectedAgentAttache implements Rout
s_logger.debug(log(seq, "Error on connecting to management node: " + req.toString() + " try = " + i));
}
if(s_logger.isInfoEnabled())
s_logger.info("IOException " + e.getMessage() + " when sending data to peer " + peerName + ", close peer connection and let it re-open");
if(s_logger.isInfoEnabled()) {
s_logger.info("IOException " + e.getMessage() + " when sending data to peer " + peerName + ", close peer connection and let it re-open");
}
}
}
} finally {

7
server/src/com/cloud/agent/manager/DirectAgentAttache.java
View File

@ -87,9 +87,10 @@ public class DirectAgentAttache extends AgentAttache {
@Override
public void send(Request req) throws AgentUnavailableException {
if (s_logger.isDebugEnabled()) {
s_logger.debug(log(req.getSequence(), "Executing " + req.toString()));
}
req.log(_id, "Executing: ");
// if (s_logger.isDebugEnabled()) {
// s_logger.debug(log(req.getSequence(), "Executing " + req.toString()));
// }
if (req instanceof Response) {
Response resp = (Response)req;
Answer[] answers = resp.getAnswers();