Repository: cassandra Updated Branches: refs/heads/trunk 1ffd27731 -> b74c2ade5
use parameterized logging Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b74c2ade Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b74c2ade Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b74c2ade Branch: refs/heads/trunk Commit: b74c2ade5c7f633262f7c292b21e3f77727a281f Parents: 1ffd277 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Sun Mar 16 16:23:53 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Sun Mar 16 16:23:53 2014 -0400 ---------------------------------------------------------------------- .../config/YamlConfigurationLoader.java | 2 +- .../apache/cassandra/gms/FailureDetector.java | 2 +- .../gms/GossipDigestSynVerbHandler.java | 2 +- src/java/org/apache/cassandra/gms/Gossiper.java | 34 ++++++++++---------- .../cassandra/io/sstable/SSTableWriter.java | 4 +-- .../apache/cassandra/net/MessagingService.java | 2 +- .../service/PendingRangeCalculatorService.java | 2 +- .../locator/NetworkTopologyStrategyTest.java | 4 +-- .../streaming/StreamingTransferTest.java | 10 +++--- 9 files changed, 31 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b74c2ade/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java index 4a1280c..5cd7c8f 100644 --- a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java +++ b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java @@ -120,7 +120,7 @@ public class YamlConfigurationLoader implements ConfigurationLoader configMap.put(sensitiveKey, "<REDACTED>"); } } - logger.info("Node configuration:[" + Joiner.on("; ").join(configMap.entrySet()) + "]"); + logger.info("Node configuration:[{}]", Joiner.on("; ").join(configMap.entrySet())); } private static class MissingPropertiesChecker extends PropertyUtils http://git-wip-us.apache.org/repos/asf/cassandra/blob/b74c2ade/src/java/org/apache/cassandra/gms/FailureDetector.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/gms/FailureDetector.java b/src/java/org/apache/cassandra/gms/FailureDetector.java index 4ecf235..291f312 100644 --- a/src/java/org/apache/cassandra/gms/FailureDetector.java +++ b/src/java/org/apache/cassandra/gms/FailureDetector.java @@ -226,7 +226,7 @@ public class FailureDetector implements IFailureDetector, FailureDetectorMBean long now = System.nanoTime(); double phi = hbWnd.phi(now); if (logger.isTraceEnabled()) - logger.trace("PHI for " + ep + " : " + phi); + logger.trace("PHI for {} : {}", ep, phi); if (PHI_FACTOR * phi > getPhiConvictThreshold()) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/b74c2ade/src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java b/src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java index 0f3a1e6..a1d1d9b 100644 --- a/src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java +++ b/src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java @@ -68,7 +68,7 @@ public class GossipDigestSynVerbHandler implements IVerbHandler<GossipDigestSyn> sb.append(gDigest); sb.append(" "); } - logger.trace("Gossip syn digests are : " + sb.toString()); + logger.trace("Gossip syn digests are : {}", sb); } doSort(gDigestList); http://git-wip-us.apache.org/repos/asf/cassandra/blob/b74c2ade/src/java/org/apache/cassandra/gms/Gossiper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java index a7c4f97..690f813 100644 --- a/src/java/org/apache/cassandra/gms/Gossiper.java +++ b/src/java/org/apache/cassandra/gms/Gossiper.java @@ -130,7 +130,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean /* Update the local heartbeat counter. */ endpointStateMap.get(FBUtilities.getBroadcastAddress()).getHeartBeatState().updateHeartBeat(); if (logger.isTraceEnabled()) - logger.trace("My heartbeat is now " + endpointStateMap.get(FBUtilities.getBroadcastAddress()).getHeartBeatState().getHeartBeatVersion()); + logger.trace("My heartbeat is now {}", endpointStateMap.get(FBUtilities.getBroadcastAddress()).getHeartBeatState().getHeartBeatVersion()); final List<GossipDigest> gDigests = new ArrayList<GossipDigest>(); Gossiper.instance.makeRandomGossipDigest(gDigests); @@ -413,7 +413,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean sb.append(gDigest); sb.append(" "); } - logger.trace("Gossip Digests are : " + sb.toString()); + logger.trace("Gossip Digests are : {}", sb); } } @@ -745,7 +745,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean { reqdEndpointState = new EndpointState(epState.getHeartBeatState()); if (logger.isTraceEnabled()) - logger.trace("local heartbeat version " + localHbVersion + " greater than " + version + " for " + forEndpoint); + logger.trace("local heartbeat version {} greater than {} for {}", localHbVersion, version, forEndpoint); } /* Accumulate all application states whose versions are greater than "version" variable */ for (Entry<ApplicationState, VersionedValue> entry : epState.getApplicationStateMap().entrySet()) @@ -759,7 +759,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean } final ApplicationState key = entry.getKey(); if (logger.isTraceEnabled()) - logger.trace("Adding state " + key + ": " + value.value); + logger.trace("Adding state {}: {}" , key, value.value); reqdEndpointState.addApplicationState(key, value); } } @@ -863,12 +863,12 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean liveEndpoints.add(addr); unreachableEndpoints.remove(addr); expireTimeEndpointMap.remove(addr); - logger.debug("removing expire time for endpoint : " + addr); + logger.debug("removing expire time for endpoint : {}", addr); logger.info("InetAddress {} is now UP", addr); for (IEndpointStateChangeSubscriber subscriber : subscribers) subscriber.onAlive(addr, localState); if (logger.isTraceEnabled()) - logger.trace("Notified " + subscribers); + logger.trace("Notified {}", subscribers); } private void markDead(InetAddress addr, EndpointState localState) @@ -882,7 +882,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean for (IEndpointStateChangeSubscriber subscriber : subscribers) subscriber.onDead(addr, localState); if (logger.isTraceEnabled()) - logger.trace("Notified " + subscribers); + logger.trace("Notified {}", subscribers); } /** @@ -901,7 +901,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean logger.info("Node {} is now part of the cluster", ep); } if (logger.isTraceEnabled()) - logger.trace("Adding endpoint state for " + ep); + logger.trace("Adding endpoint state for {}", ep); endpointStateMap.put(ep, epState); // the node restarted: it is up to the subscriber to take whatever action is necessary @@ -945,7 +945,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean if (justRemovedEndpoints.containsKey(ep)) { if (logger.isTraceEnabled()) - logger.trace("Ignoring gossip for " + ep + " because it is quarantined"); + logger.trace("Ignoring gossip for {} because it is quarantined", ep); continue; } @@ -960,12 +960,12 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean int localGeneration = localEpStatePtr.getHeartBeatState().getGeneration(); int remoteGeneration = remoteState.getHeartBeatState().getGeneration(); if (logger.isTraceEnabled()) - logger.trace(ep + "local generation " + localGeneration + ", remote generation " + remoteGeneration); + logger.trace("{} local generation {}, remote generation {}", ep, localGeneration, remoteGeneration); if (remoteGeneration > localGeneration) { if (logger.isTraceEnabled()) - logger.trace("Updating heartbeat state generation to " + remoteGeneration + " from " + localGeneration + " for " + ep); + logger.trace("Updating heartbeat state generation to {} from {} for {}", remoteGeneration, localGeneration, ep); // major state change will handle the update by inserting the remote state directly handleMajorStateChange(ep, remoteState); } @@ -980,14 +980,14 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean applyNewStates(ep, localEpStatePtr, remoteState); } else if (logger.isTraceEnabled()) - logger.trace("Ignoring remote version " + remoteMaxVersion + " <= " + localMaxVersion + " for " + ep); + logger.trace("Ignoring remote version {} <= {} for {}", remoteMaxVersion, localMaxVersion, ep); if (!localEpStatePtr.isAlive() && !isDeadState(localEpStatePtr)) // unless of course, it was dead markAlive(ep, localEpStatePtr); } else { if (logger.isTraceEnabled()) - logger.trace("Ignoring remote generation " + remoteGeneration + " < " + localGeneration); + logger.trace("Ignoring remote generation {} < {}", remoteGeneration, localGeneration); } } else @@ -1006,7 +1006,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean localState.setHeartBeatState(remoteState.getHeartBeatState()); if (logger.isTraceEnabled()) - logger.trace("Updating heartbeat state version to " + localState.getHeartBeatState().getHeartBeatVersion() + " from " + oldVersion + " for " + addr + " ..."); + logger.trace("Updating heartbeat state version to {} from {} for {} ...", localState.getHeartBeatState().getHeartBeatVersion(), oldVersion, addr); // we need to make two loops here, one to apply, then another to notify, this way all states in an update are present and current when the notifications are received for (Entry<ApplicationState, VersionedValue> remoteEntry : remoteState.getApplicationStateMap().entrySet()) @@ -1047,7 +1047,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean /* We are here since we have no data for this endpoint locally so request everthing. */ deltaGossipDigestList.add(new GossipDigest(gDigest.getEndpoint(), remoteGeneration, 0)); if (logger.isTraceEnabled()) - logger.trace("requestAll for " + gDigest.getEndpoint()); + logger.trace("requestAll for {}", gDigest.getEndpoint()); } /* Send all the data with version greater than maxRemoteVersion */ @@ -1152,7 +1152,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean //notify snitches that Gossiper is about to start DatabaseDescriptor.getEndpointSnitch().gossiperStarting(); if (logger.isTraceEnabled()) - logger.trace("gossip started with generation " + localState.getHeartBeatState().getGeneration()); + logger.trace("gossip started with generation {}", localState.getHeartBeatState().getGeneration()); scheduledGossipTask = executor.scheduleWithFixedDelay(new GossipTask(), Gossiper.intervalInMillis, @@ -1244,7 +1244,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean endpointStateMap.put(ep, epState); unreachableEndpoints.put(ep, System.nanoTime()); if (logger.isTraceEnabled()) - logger.trace("Adding saved endpoint " + ep + " " + epState.getHeartBeatState().getGeneration()); + logger.trace("Adding saved endpoint {} {}", ep, epState.getHeartBeatState().getGeneration()); } public void addLocalApplicationState(ApplicationState state, VersionedValue value) http://git-wip-us.apache.org/repos/asf/cassandra/blob/b74c2ade/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java index a7fd881..b7e8f05 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java @@ -158,7 +158,7 @@ public class SSTableWriter extends SSTable first = lastWrittenKey; if (logger.isTraceEnabled()) - logger.trace("wrote " + decoratedKey + " at " + dataPosition); + logger.trace("wrote {} at {}", decoratedKey, dataPosition); iwriter.append(decoratedKey, index); dbuilder.addPotentialBoundary(dataPosition); } @@ -471,7 +471,7 @@ public class SSTableWriter extends SSTable } if (logger.isTraceEnabled()) - logger.trace("wrote index entry: " + indexEntry + " at " + indexPosition); + logger.trace("wrote index entry: {} at {}", indexEntry, indexPosition); summary.maybeAddEntry(key, indexPosition); builder.addPotentialBoundary(indexPosition); http://git-wip-us.apache.org/repos/asf/cassandra/blob/b74c2ade/src/java/org/apache/cassandra/net/MessagingService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java index 9713576..73662c1 100644 --- a/src/java/org/apache/cassandra/net/MessagingService.java +++ b/src/java/org/apache/cassandra/net/MessagingService.java @@ -622,7 +622,7 @@ public final class MessagingService implements MessagingServiceMBean public void sendOneWay(MessageOut message, int id, InetAddress to) { if (logger.isTraceEnabled()) - logger.trace(FBUtilities.getBroadcastAddress() + " sending " + message.verb + " to " + id + "@" + to); + logger.trace("{} sending {} to {}@{}", FBUtilities.getBroadcastAddress(), message.verb, id, to); if (to.equals(FBUtilities.getBroadcastAddress())) logger.trace("Message-to-self {} going over MessagingService", message); http://git-wip-us.apache.org/repos/asf/cassandra/blob/b74c2ade/src/java/org/apache/cassandra/service/PendingRangeCalculatorService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/PendingRangeCalculatorService.java b/src/java/org/apache/cassandra/service/PendingRangeCalculatorService.java index c2b1814..2e201bf 100644 --- a/src/java/org/apache/cassandra/service/PendingRangeCalculatorService.java +++ b/src/java/org/apache/cassandra/service/PendingRangeCalculatorService.java @@ -202,6 +202,6 @@ public class PendingRangeCalculatorService extends PendingRangeCalculatorService tm.setPendingRanges(keyspaceName, pendingRanges); if (logger.isDebugEnabled()) - logger.debug("Pending ranges:\n" + (pendingRanges.isEmpty() ? "<empty>" : tm.printPendingRanges())); + logger.debug("Pending ranges:\n{}", (pendingRanges.isEmpty() ? "<empty>" : tm.printPendingRanges())); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/b74c2ade/test/unit/org/apache/cassandra/locator/NetworkTopologyStrategyTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/locator/NetworkTopologyStrategyTest.java b/test/unit/org/apache/cassandra/locator/NetworkTopologyStrategyTest.java index d4d5a85..be93faa 100644 --- a/test/unit/org/apache/cassandra/locator/NetworkTopologyStrategyTest.java +++ b/test/unit/org/apache/cassandra/locator/NetworkTopologyStrategyTest.java @@ -121,7 +121,7 @@ public class NetworkTopologyStrategyTest byte[] ipBytes = new byte[]{10, (byte)dc, (byte)rack, (byte)ep}; InetAddress address = InetAddress.getByAddress(ipBytes); StringToken token = new StringToken(String.format("%02x%02x%02x", ep, rack, dc)); - logger.debug("adding node " + address + " at " + token); + logger.debug("adding node {} at {}", address, token); tokens.put(address, token); } } @@ -137,7 +137,7 @@ public class NetworkTopologyStrategyTest Assert.assertEquals(totalRF, endpoints.size()); Assert.assertEquals(totalRF, epSet.size()); - logger.debug(testToken + ": " + endpoints.toString()); + logger.debug("{}: {}", testToken, endpoints); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/b74c2ade/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java index f09b6a4..ac0b30a 100644 --- a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java +++ b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java @@ -131,7 +131,7 @@ public class StreamingTransferTest extends SchemaLoader private List<String> createAndTransfer(ColumnFamilyStore cfs, Mutator mutator, boolean transferSSTables) throws Exception { // write a temporary SSTable, and unregister it - logger.debug("Mutating " + cfs.name); + logger.debug("Mutating {}", cfs.name); long timestamp = 1234; for (int i = 1; i <= 3; i++) mutator.mutate("key" + i, "col" + i, timestamp); @@ -140,7 +140,7 @@ public class StreamingTransferTest extends SchemaLoader assertEquals(1, cfs.getSSTables().size()); // transfer the first and last key - logger.debug("Transferring " + cfs.name); + logger.debug("Transferring {}", cfs.name); int[] offs; if (transferSSTables) { @@ -179,7 +179,7 @@ public class StreamingTransferTest extends SchemaLoader for (int off : offs) keys.add("key" + off); - logger.debug("... everything looks good for " + cfs.name); + logger.debug("... everything looks good for {}", cfs.name); return keys; } @@ -232,7 +232,7 @@ public class StreamingTransferTest extends SchemaLoader cf.addColumn(column(col, "v", timestamp)); cf.addColumn(new Cell(cellname("birthdate"), ByteBufferUtil.bytes(val), timestamp)); Mutation rm = new Mutation("Keyspace1", ByteBufferUtil.bytes(key), cf); - logger.debug("Applying row to transfer " + rm); + logger.debug("Applying row to transfer {}", rm); rm.apply(); } }, transferSSTables); @@ -456,7 +456,7 @@ public class StreamingTransferTest extends SchemaLoader cf.addColumn(column(colName, "value", timestamp)); cf.addColumn(new Cell(cellname("birthdate"), ByteBufferUtil.bytes(new Date(timestamp).toString()), timestamp)); Mutation rm = new Mutation("Keyspace1", ByteBufferUtil.bytes(key), cf); - logger.debug("Applying row to transfer " + rm); + logger.debug("Applying row to transfer {}", rm); rm.apply(); } };
