You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2009/07/29 19:05:48 UTC
svn commit: r798980 - in
/incubator/cassandra/trunk/src/java/org/apache/cassandra:
gms/FailureDetector.java gms/Gossiper.java io/SSTableWriter.java
net/UdpConnection.java
Author: jbellis
Date: Wed Jul 29 17:05:47 2009
New Revision: 798980
URL: http://svn.apache.org/viewvc?rev=798980&view=rev
Log:
add isTraceEnabled checks similar to isDebugEnabled. patch by jbellis for CASSANDRA-174
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/FailureDetector.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableWriter.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/UdpConnection.java
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/FailureDetector.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/FailureDetector.java?rev=798980&r1=798979&r2=798980&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/FailureDetector.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/FailureDetector.java Wed Jul 29 17:05:47 2009
@@ -158,7 +158,8 @@
public void report(EndPoint ep)
{
- logger_.trace("reporting " + ep);
+ if (logger_.isTraceEnabled())
+ logger_.trace("reporting " + ep);
long now = System.currentTimeMillis();
ArrivalWindow heartbeatWindow = arrivalSamples_.get(ep);
if ( heartbeatWindow == null )
@@ -180,7 +181,8 @@
/* We need this so that we do not suspect a convict. */
boolean isConvicted = false;
double phi = hbWnd.phi(now);
- logger_.trace("PHI for " + ep + " : " + phi);
+ if (logger_.isTraceEnabled())
+ logger_.trace("PHI for " + ep + " : " + phi);
/*
if ( phi > phiConvictThreshold_ )
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java?rev=798980&r1=798979&r2=798980&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java Wed Jul 29 17:05:47 2009
@@ -73,7 +73,8 @@
if ( !bVal )
doGossipToSeed(message);
- logger_.trace("Performing status check ...");
+ if (logger_.isTraceEnabled())
+ logger_.trace("Performing status check ...");
doStatusCheck();
}
}
@@ -336,7 +337,8 @@
sb.append(gDigest);
sb.append(" ");
}
- logger_.trace("Gossip Digests are : " + sb.toString());
+ if (logger_.isTraceEnabled())
+ logger_.trace("Gossip Digests are : " + sb.toString());
}
public int getCurrentGenerationNumber(EndPoint endpoint)
@@ -359,7 +361,8 @@
ByteArrayOutputStream bos = new ByteArrayOutputStream(Gossiper.MAX_GOSSIP_PACKET_SIZE);
DataOutputStream dos = new DataOutputStream(bos);
GossipDigestAckMessage.serializer().serialize(gDigestAckMessage, dos);
- logger_.trace("@@@@ Size of GossipDigestAckMessage is " + bos.toByteArray().length);
+ if (logger_.isTraceEnabled())
+ logger_.trace("@@@@ Size of GossipDigestAckMessage is " + bos.toByteArray().length);
Message message = new Message(localEndPoint_, Gossiper.GOSSIP_STAGE, GOSSIP_DIGEST_ACK_VERB, bos.toByteArray());
return message;
}
@@ -384,7 +387,8 @@
}
EndPoint to = eps.get(++rrIndex_);
- logger_.trace("Sending a GossipDigestSynMessage to " + to + " ...");
+ if (logger_.isTraceEnabled())
+ logger_.trace("Sending a GossipDigestSynMessage to " + to + " ...");
MessagingService.getMessagingInstance().sendUdpOneWay(message, to);
return seeds_.contains(to);
}
@@ -403,7 +407,8 @@
List<EndPoint> liveEndPoints = new ArrayList<EndPoint>(epSet);
int index = (size == 1) ? 0 : random_.nextInt(size);
EndPoint to = liveEndPoints.get(index);
- logger_.trace("Sending a GossipDigestSynMessage to " + to + " ...");
+ if (logger_.isTraceEnabled())
+ logger_.trace("Sending a GossipDigestSynMessage to " + to + " ...");
MessagingService.getMessagingInstance().sendUdpOneWay(message, to);
return seeds_.contains(to);
}
@@ -613,7 +618,8 @@
void markAlive(EndPoint addr, EndPointState localState)
{
- logger_.trace("marking as alive " + addr);
+ if (logger_.isTraceEnabled())
+ logger_.trace("marking as alive " + addr);
if ( !localState.isAlive() )
{
isAlive(addr, localState, true);
@@ -691,7 +697,8 @@
{
int oldVersion = localHbState.getHeartBeatVersion();
localState.setHeartBeatState(remoteHbState);
- logger_.trace("Updating heartbeat state version to " + localState.getHeartBeatState().getHeartBeatVersion() + " from " + oldVersion + " for " + addr + " ...");
+ if (logger_.isTraceEnabled())
+ logger_.trace("Updating heartbeat state version to " + localState.getHeartBeatState().getHeartBeatVersion() + " from " + oldVersion + " for " + addr + " ...");
}
}
}
@@ -956,7 +963,8 @@
public void doVerb(Message message)
{
EndPoint from = message.getFrom();
- logger_.trace("Received a GossipDigestSynMessage from " + from);
+ if (logger_.isTraceEnabled())
+ logger_.trace("Received a GossipDigestSynMessage from " + from);
byte[] bytes = message.getMessageBody();
DataInputStream dis = new DataInputStream( new ByteArrayInputStream(bytes) );
@@ -980,7 +988,8 @@
GossipDigestAckMessage gDigestAck = new GossipDigestAckMessage(deltaGossipDigestList, deltaEpStateMap);
Message gDigestAckMessage = Gossiper.instance().makeGossipDigestAckMessage(gDigestAck);
- logger_.trace("Sending a GossipDigestAckMessage to " + from);
+ if (logger_.isTraceEnabled())
+ logger_.trace("Sending a GossipDigestAckMessage to " + from);
MessagingService.getMessagingInstance().sendUdpOneWay(gDigestAckMessage, from);
}
catch (IOException e)
@@ -1040,7 +1049,8 @@
public void doVerb(Message message)
{
EndPoint from = message.getFrom();
- logger_.trace("Received a GossipDigestAckMessage from " + from);
+ if (logger_.isTraceEnabled())
+ logger_.trace("Received a GossipDigestAckMessage from " + from);
byte[] bytes = message.getMessageBody();
DataInputStream dis = new DataInputStream( new ByteArrayInputStream(bytes) );
@@ -1070,7 +1080,8 @@
GossipDigestAck2Message gDigestAck2 = new GossipDigestAck2Message(deltaEpStateMap);
Message gDigestAck2Message = Gossiper.instance().makeGossipDigestAck2Message(gDigestAck2);
- logger_.trace("Sending a GossipDigestAck2Message to " + from);
+ if (logger_.isTraceEnabled())
+ logger_.trace("Sending a GossipDigestAck2Message to " + from);
MessagingService.getMessagingInstance().sendUdpOneWay(gDigestAck2Message, from);
}
catch ( IOException e )
@@ -1087,7 +1098,8 @@
public void doVerb(Message message)
{
EndPoint from = message.getFrom();
- logger_.trace("Received a GossipDigestAck2Message from " + from);
+ if (logger_.isTraceEnabled())
+ logger_.trace("Received a GossipDigestAck2Message from " + from);
byte[] bytes = message.getMessageBody();
DataInputStream dis = new DataInputStream( new ByteArrayInputStream(bytes) );
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableWriter.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableWriter.java?rev=798980&r1=798979&r2=798980&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableWriter.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableWriter.java Wed Jul 29 17:05:47 2009
@@ -55,7 +55,8 @@
long indexPosition = indexRAF.getFilePointer();
indexRAF.writeUTF(decoratedKey);
indexRAF.writeLong(position);
- logger.trace("wrote " + decoratedKey + " at " + position);
+ if (logger.isTraceEnabled())
+ logger.trace("wrote " + decoratedKey + " at " + position);
if (keysWritten++ % INDEX_INTERVAL != 0)
return;
@@ -64,7 +65,8 @@
indexPositions = new ArrayList<KeyPosition>();
}
indexPositions.add(new KeyPosition(decoratedKey, indexPosition));
- logger.trace("wrote index of " + decoratedKey + " at " + indexPosition);
+ if (logger.isTraceEnabled())
+ logger.trace("wrote index of " + decoratedKey + " at " + indexPosition);
}
// TODO make this take a DataOutputStream and wrap the byte[] version to combine them
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/net/UdpConnection.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/UdpConnection.java?rev=798980&r1=798979&r2=798980&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/net/UdpConnection.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/net/UdpConnection.java Wed Jul 29 17:05:47 2009
@@ -78,7 +78,8 @@
byte[] data = bos.toByteArray();
if ( data.length > 0 )
{
- logger_.trace("Size of Gossip packet " + data.length);
+ if (logger_.isTraceEnabled())
+ logger_.trace("Size of Gossip packet " + data.length);
byte[] protocol = BasicUtilities.intToByteArray(protocol_);
ByteBuffer buffer = ByteBuffer.allocate(data.length + protocol.length);
buffer.put( protocol );