cassandra git commit: use parameterized logging
Repository: cassandra Updated Branches: refs/heads/trunk 71bfab64b -> c3373012d 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/c3373012 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3373012 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3373012 Branch: refs/heads/trunk Commit: c3373012d4cf0f574bad03ce179b137f4f2aa29e Parents: 71bfab6 Author: Dave Brosius Authored: Fri Jul 14 20:41:31 2017 -0400 Committer: Dave Brosius Committed: Fri Jul 14 20:41:31 2017 -0400 -- src/java/org/apache/cassandra/repair/RepairSession.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3373012/src/java/org/apache/cassandra/repair/RepairSession.java -- diff --git a/src/java/org/apache/cassandra/repair/RepairSession.java b/src/java/org/apache/cassandra/repair/RepairSession.java index 98ed1a3..d00e1b2 100644 --- a/src/java/org/apache/cassandra/repair/RepairSession.java +++ b/src/java/org/apache/cassandra/repair/RepairSession.java @@ -156,7 +156,7 @@ public class RepairSession extends AbstractFuture implement { if (!FailureDetector.instance.isAlive(endpoint)) { -logger.info("Removing a dead node from Repair due to -force " + endpoint); +logger.info("Removing a dead node from Repair due to -force {}", endpoint); removeCandidates.add(endpoint); } } - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
cassandra git commit: use parameterized logging
Repository: cassandra Updated Branches: refs/heads/trunk e368cf91a -> d8836d485 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/d8836d48 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d8836d48 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d8836d48 Branch: refs/heads/trunk Commit: d8836d4856599375951ef77f8189fb71a4335ada Parents: e368cf9 Author: Dave Brosius Authored: Wed May 17 20:59:20 2017 -0400 Committer: Dave Brosius Committed: Wed May 17 20:59:20 2017 -0400 -- src/java/org/apache/cassandra/dht/RangeStreamer.java | 6 +++--- src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8836d48/src/java/org/apache/cassandra/dht/RangeStreamer.java -- diff --git a/src/java/org/apache/cassandra/dht/RangeStreamer.java b/src/java/org/apache/cassandra/dht/RangeStreamer.java index d104b23..134ed13 100644 --- a/src/java/org/apache/cassandra/dht/RangeStreamer.java +++ b/src/java/org/apache/cassandra/dht/RangeStreamer.java @@ -181,7 +181,7 @@ public class RangeStreamer { if(Keyspace.open(keyspaceName).getReplicationStrategy() instanceof LocalStrategy) { -logger.info("Not adding ranges for Local Strategy keyspace=" + keyspaceName); +logger.info("Not adding ranges for Local Strategy keyspace={}", keyspaceName); return; } @@ -190,7 +190,7 @@ public class RangeStreamer ? getAllRangesWithStrictSourcesFor(keyspaceName, ranges) : getAllRangesWithSourcesFor(keyspaceName, ranges); for (Map.Entry, InetAddress> entry : rangesForKeyspace.entries()) -logger.info(String.format("{}: range {} exists on {} for keyspace {}", description, entry.getKey(), entry.getValue(), keyspaceName)); +logger.info("{}: range {} exists on {} for keyspace {}", description, entry.getKey(), entry.getValue(), keyspaceName); Multimap> rangeFetchMap = useStrictSource ? getRangeFetchMap(rangesForKeyspace, sourceFilters, keyspaceName, useStrictConsistency) : @@ -375,7 +375,7 @@ public class RangeStreamer { RangeFetchMapCalculator calculator = new RangeFetchMapCalculator(rangesWithSources, sourceFilters, keyspace); Multimap> rangeFetchMapMap = calculator.getRangeFetchMap(); -logger.info("Output from RangeFetchMapCalculator for keyspace " + keyspace); +logger.info("Output from RangeFetchMapCalculator for keyspace {}", keyspace); validateRangeFetchMap(rangesWithSources, rangeFetchMapMap, keyspace); return rangeFetchMapMap; } http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8836d48/src/java/org/apache/cassandra/net/OutboundTcpConnection.java -- diff --git a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java index 0677958..42abbe6 100644 --- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java +++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java @@ -193,7 +193,7 @@ public class OutboundTcpConnection extends FastThreadLocalThread /** * This is a helper method for unit testing. Disclaimer: Do not use this method outside unit tests, as * this method is iterating the queue which can be an expensive operation (CPU time, queue locking). - * + * * @return true, if the queue contains at least one expired element */ @VisibleForTesting // (otherwise = VisibleForTesting.NONE) @@ -275,7 +275,7 @@ public class OutboundTcpConnection extends FastThreadLocalThread } catch (InternodeAuthFailed e) { -logger.warn("Internode auth failed connecting to " + poolReference.endPoint()); +logger.warn("Internode auth failed connecting to {}", poolReference.endPoint()); //Remove the connection pool and other thread so messages aren't queued MessagingService.instance().destroyConnectionPool(poolReference.endPoint()); } @@ -594,7 +594,7 @@ public class OutboundTcpConnection extends FastThreadLocalThread /** * Expire elements from the queue if the queue is pretty full and expiration is not already in progress. * This method will only remove droppable expired entries. If no such element exists, nothing is removed from the queue. - * + * * @param timestampNanos The current time as from System.nanoTime() */
cassandra git commit: use parameterized logging
Repository: cassandra Updated Branches: refs/heads/trunk bf3255fc9 -> f147ca91c 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/f147ca91 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f147ca91 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f147ca91 Branch: refs/heads/trunk Commit: f147ca91c759b8013c5226774bc974c342bee3f0 Parents: bf3255f Author: Dave Brosius Authored: Thu Jun 23 01:35:43 2016 -0400 Committer: Dave Brosius Committed: Thu Jun 23 01:36:23 2016 -0400 -- src/java/org/apache/cassandra/config/Config.java | 2 +- .../org/apache/cassandra/db/WindowsFailedSnapshotTracker.java| 3 +-- src/java/org/apache/cassandra/dht/RangeStreamer.java | 4 ++-- .../org/apache/cassandra/dht/tokenallocator/TokenAllocation.java | 4 ++-- src/java/org/apache/cassandra/io/util/FileUtils.java | 2 +- src/java/org/apache/cassandra/service/StartupChecks.java | 2 +- src/java/org/apache/cassandra/utils/WindowsTimer.java| 4 ++-- 7 files changed, 10 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f147ca91/src/java/org/apache/cassandra/config/Config.java -- diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java index c18d1e0..2473c0c 100644 --- a/src/java/org/apache/cassandra/config/Config.java +++ b/src/java/org/apache/cassandra/config/Config.java @@ -459,6 +459,6 @@ public class Config configMap.put(name, value); } -logger.info("Node configuration:[" + Joiner.on("; ").join(configMap.entrySet()) + "]"); +logger.info("Node configuration:[{}]", Joiner.on("; ").join(configMap.entrySet())); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/f147ca91/src/java/org/apache/cassandra/db/WindowsFailedSnapshotTracker.java -- diff --git a/src/java/org/apache/cassandra/db/WindowsFailedSnapshotTracker.java b/src/java/org/apache/cassandra/db/WindowsFailedSnapshotTracker.java index 7cc7893..134fb11 100644 --- a/src/java/org/apache/cassandra/db/WindowsFailedSnapshotTracker.java +++ b/src/java/org/apache/cassandra/db/WindowsFailedSnapshotTracker.java @@ -85,8 +85,7 @@ public class WindowsFailedSnapshotTracker } catch (IOException e) { -logger.warn("Failed to open {}. Obsolete snapshots from previous runs will not be deleted.", TODELETEFILE); -logger.warn("Exception: " + e); +logger.warn("Failed to open {}. Obsolete snapshots from previous runs will not be deleted.", TODELETEFILE, e); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/f147ca91/src/java/org/apache/cassandra/dht/RangeStreamer.java -- diff --git a/src/java/org/apache/cassandra/dht/RangeStreamer.java b/src/java/org/apache/cassandra/dht/RangeStreamer.java index 8265e2b..ee2d792 100644 --- a/src/java/org/apache/cassandra/dht/RangeStreamer.java +++ b/src/java/org/apache/cassandra/dht/RangeStreamer.java @@ -326,8 +326,8 @@ public class RangeStreamer throw new IllegalStateException("Unable to find sufficient sources for streaming range " + range + " in keyspace " + keyspace + " with RF=1." + "If you want to ignore this, consider using system property -Dcassandra.consistent.rangemovement=false."); else -logger.warn("Unable to find sufficient sources for streaming range " + range + " in keyspace " + keyspace + " with RF=1. " + -"Keyspace might be missing data."); +logger.warn("Unable to find sufficient sources for streaming range {} in keyspace {} with RF=1. " + +"Keyspace might be missing data.", range, keyspace); } else throw new IllegalStateException("Unable to find sufficient sources for streaming range " + range + " in keyspace " + keyspace); http://git-wip-us.apache.org/repos/asf/cassandra/blob/f147ca91/src/java/org/apache/cassandra/dht/tokenallocator/TokenAllocation.java -- diff --git a/src/java/org/apache/cassandra/dht/tokenallocator/TokenAllocation.java b/src/java/org/apache/cassandra/dht/tokenallocator/TokenAllocation.java index e715ff6..7658ea0 100644 --- a/src/java/org/apache/cassandra/dht/tokenallocator/TokenAlloca
cassandra git commit: use parameterized logging
Repository: cassandra Updated Branches: refs/heads/trunk a7e6e0f55 -> 3e6fe8bd2 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/3e6fe8bd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e6fe8bd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e6fe8bd Branch: refs/heads/trunk Commit: 3e6fe8bd2874dbbbfe9dbe29e0cc073249d42001 Parents: a7e6e0f Author: Dave Brosius Authored: Mon Mar 30 21:16:13 2015 -0400 Committer: Dave Brosius Committed: Mon Mar 30 21:16:13 2015 -0400 -- src/java/org/apache/cassandra/dht/RangeStreamer.java | 2 +- src/java/org/apache/cassandra/gms/Gossiper.java | 2 +- src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 4 ++-- src/java/org/apache/cassandra/utils/CoalescingStrategies.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e6fe8bd/src/java/org/apache/cassandra/dht/RangeStreamer.java -- diff --git a/src/java/org/apache/cassandra/dht/RangeStreamer.java b/src/java/org/apache/cassandra/dht/RangeStreamer.java index fecb308..68c8a11 100644 --- a/src/java/org/apache/cassandra/dht/RangeStreamer.java +++ b/src/java/org/apache/cassandra/dht/RangeStreamer.java @@ -336,7 +336,7 @@ public class RangeStreamer Set> availableRanges = stateStore.getAvailableRanges(keyspace, StorageService.getPartitioner()); if (ranges.removeAll(availableRanges)) { -logger.info(availableRanges + " already available. Skipping streaming."); +logger.info("Some ranges of {} are already available. Skipping streaming those ranges.", availableRanges); } if (logger.isDebugEnabled()) http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e6fe8bd/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 07f2615..34f54a1 100644 --- a/src/java/org/apache/cassandra/gms/Gossiper.java +++ b/src/java/org/apache/cassandra/gms/Gossiper.java @@ -925,7 +925,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e6fe8bd/src/java/org/apache/cassandra/net/OutboundTcpConnection.java -- diff --git a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java index 9ea4660..dc43106 100644 --- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java +++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java @@ -94,7 +94,7 @@ public class OutboundTcpConnection extends Thread case "MOVINGAVERAGE": case "FIXED": case "DISABLED": -logger.info("OutboundTcpConnection using coalescing strategy " + strategy); +logger.info("OutboundTcpConnection using coalescing strategy {}", strategy); break; default: //Check that it can be loaded @@ -103,7 +103,7 @@ public class OutboundTcpConnection extends Thread int coalescingWindow = DatabaseDescriptor.getOtcCoalescingWindow(); if (coalescingWindow != Config.otc_coalescing_window_us_default) -logger.info("OutboundTcpConnection coalescing window set to " + coalescingWindow + "μs"); +logger.info("OutboundTcpConnection coalescing window set to {}μs", coalescingWindow); if (coalescingWindow < 0) throw new ExceptionInInitializerError( http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e6fe8bd/src/java/org/apache/cassandra/utils/CoalescingStrategies.java -- diff --git a/src/java/org/apache/cassandra/utils/CoalescingStrategies.java b/src/java/org/apache/cassandra/utils/CoalescingStrategies.java index ca1399b..7dba97b 100644 --- a/src/java/org/apache/cassandra/utils/CoalescingStrategies.java +++ b/src/java/org/apache/cassandra/utils/CoalescingStrategies.java @@ -169,7 +169,7 @@ public class CoalescingStrategies if (DEBUG_COALESCING && shouldLogAverage) {
cassandra git commit: use parameterized logging
Repository: cassandra Updated Branches: refs/heads/trunk 642546aba -> 4a4f83334 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/4a4f8333 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4a4f8333 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4a4f8333 Branch: refs/heads/trunk Commit: 4a4f83334265b1c2200e818b3439c146e77d46be Parents: 642546a Author: Dave Brosius Authored: Tue Mar 17 21:10:23 2015 -0400 Committer: Dave Brosius Committed: Tue Mar 17 21:10:23 2015 -0400 -- .../org/apache/cassandra/io/sstable/format/big/BigTableWriter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a4f8333/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java -- diff --git a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java index ea2549d..ec5c165 100644 --- a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java +++ b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java @@ -124,7 +124,7 @@ public class BigTableWriter extends SSTableWriter first = lastWrittenKey; if (logger.isTraceEnabled()) -logger.trace("wrote " + decoratedKey + " at " + dataEnd); +logger.trace("wrote {} at {}", decoratedKey, dataEnd); iwriter.append(decoratedKey, index, dataEnd); dbuilder.addPotentialBoundary(dataEnd); }
cassandra git commit: use parameterized logging
Repository: cassandra Updated Branches: refs/heads/trunk be13d35b2 -> f3399a292 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/f3399a29 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f3399a29 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f3399a29 Branch: refs/heads/trunk Commit: f3399a292e64a8a00d4240e1c9395c65caa1ad92 Parents: be13d35 Author: Dave Brosius Authored: Wed Mar 11 02:03:11 2015 -0400 Committer: Dave Brosius Committed: Wed Mar 11 02:03:11 2015 -0400 -- .../apache/cassandra/io/sstable/format/SSTableReader.java| 4 ++-- src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 +- src/java/org/apache/cassandra/utils/SigarLibrary.java| 8 3 files changed, 7 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3399a29/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java -- diff --git a/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java b/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java index e296f35..65d539f 100644 --- a/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java +++ b/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java @@ -279,11 +279,11 @@ public abstract class SSTableReader extends SSTable implements SelfRefCountedhttp://git-wip-us.apache.org/repos/asf/cassandra/blob/f3399a29/src/java/org/apache/cassandra/service/CassandraDaemon.java -- diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java index 5c18cde..036ac4c 100644 --- a/src/java/org/apache/cassandra/service/CassandraDaemon.java +++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java @@ -522,7 +522,7 @@ public class CassandraDaemon else { if (runManaged) -logger.error("Exception encountered during startup: " + e.getMessage()); +logger.error("Exception encountered during startup: {}", e.getMessage()); // try to warn user on stdout too, if we haven't already detached System.err.println(e.getMessage()); exitOrFail(3, "Exception encountered during startup: " + e.getMessage()); http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3399a29/src/java/org/apache/cassandra/utils/SigarLibrary.java -- diff --git a/src/java/org/apache/cassandra/utils/SigarLibrary.java b/src/java/org/apache/cassandra/utils/SigarLibrary.java index bcd4021..be85977 100644 --- a/src/java/org/apache/cassandra/utils/SigarLibrary.java +++ b/src/java/org/apache/cassandra/utils/SigarLibrary.java @@ -81,7 +81,7 @@ public class SigarLibrary } catch (SigarException sigarException) { -logger.warn("Could not determine if max processes was acceptable. Error message: " + sigarException); +logger.warn("Could not determine if max processes was acceptable. Error message: {}", sigarException); return false; } } @@ -102,7 +102,7 @@ public class SigarLibrary } catch (SigarException sigarException) { -logger.warn("Could not determine if max open file handle limit is correctly configured. Error message: " + sigarException); +logger.warn("Could not determine if max open file handle limit is correctly configured. Error message: {}", sigarException); return false; } } @@ -127,7 +127,7 @@ public class SigarLibrary } catch (SigarException sigarException) { -logger.warn("Could not determine if VirtualMemoryMax was acceptable. Error message: " + sigarException); +logger.warn("Could not determine if VirtualMemoryMax was acceptable. Error message: {}", sigarException); return false; } } @@ -149,7 +149,7 @@ public class SigarLibrary } catch (SigarException sigarException) { -logger.warn("Could not determine if swap configuration is acceptable. Error message: " + sigarException); +logger.warn("Could not determine if swap configuration is acceptable. Error message: {}", sigarException); return false; } }
cassandra git commit: use parameterized logging
Repository: cassandra Updated Branches: refs/heads/trunk dde4d8293 -> a289e71bd 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/a289e71b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a289e71b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a289e71b Branch: refs/heads/trunk Commit: a289e71bd883bce6b78169b64c95cd6c2e1a8853 Parents: dde4d82 Author: Dave Brosius Authored: Fri Jan 9 00:33:25 2015 -0500 Committer: Dave Brosius Committed: Fri Jan 9 00:33:25 2015 -0500 -- src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a289e71b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java -- diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java index 6b40864..e98d3d2 100644 --- a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java @@ -150,7 +150,7 @@ public class CommitLogSegment } else { -logger.debug("Creating new CommitLog segment: " + logFile); +logger.debug("Creating new CommitLog segment: {}", logFile); } }
[1/3] cassandra git commit: use parameterized logging
Repository: cassandra Updated Branches: refs/heads/trunk d4a8a8175 -> b7082df27 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/a9109302 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9109302 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a9109302 Branch: refs/heads/trunk Commit: a910930272a4a6443e6c5a2969d5add8b76fe752 Parents: ceed3a2 Author: Dave Brosius Authored: Fri Dec 5 21:16:54 2014 -0500 Committer: Dave Brosius Committed: Fri Dec 5 21:16:54 2014 -0500 -- src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9109302/src/java/org/apache/cassandra/db/ColumnFamilyStore.java -- diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java index b5c6c98..0e7e5f2 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@ -1855,14 +1855,14 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean if (sstable == null || !sstable.acquireReference()) { if (logger.isDebugEnabled()) -logger.debug("using snapshot sstable " + entries.getKey()); +logger.debug("using snapshot sstable {}", entries.getKey()); sstable = SSTableReader.open(entries.getKey(), entries.getValue(), metadata, partitioner); // This is technically not necessary since it's a snapshot but makes things easier sstable.acquireReference(); } else if (logger.isDebugEnabled()) { -logger.debug("using active sstable " + entries.getKey()); +logger.debug("using active sstable {}", entries.getKey()); } readers.add(sstable); }
[1/2] cassandra git commit: use parameterized logging
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 6e7a22317 -> 358f9f3fa 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/a9109302 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9109302 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a9109302 Branch: refs/heads/cassandra-2.1 Commit: a910930272a4a6443e6c5a2969d5add8b76fe752 Parents: ceed3a2 Author: Dave Brosius Authored: Fri Dec 5 21:16:54 2014 -0500 Committer: Dave Brosius Committed: Fri Dec 5 21:16:54 2014 -0500 -- src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9109302/src/java/org/apache/cassandra/db/ColumnFamilyStore.java -- diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java index b5c6c98..0e7e5f2 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@ -1855,14 +1855,14 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean if (sstable == null || !sstable.acquireReference()) { if (logger.isDebugEnabled()) -logger.debug("using snapshot sstable " + entries.getKey()); +logger.debug("using snapshot sstable {}", entries.getKey()); sstable = SSTableReader.open(entries.getKey(), entries.getValue(), metadata, partitioner); // This is technically not necessary since it's a snapshot but makes things easier sstable.acquireReference(); } else if (logger.isDebugEnabled()) { -logger.debug("using active sstable " + entries.getKey()); +logger.debug("using active sstable {}", entries.getKey()); } readers.add(sstable); }
cassandra git commit: use parameterized logging
Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 ceed3a20e -> a91093027 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/a9109302 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9109302 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a9109302 Branch: refs/heads/cassandra-2.0 Commit: a910930272a4a6443e6c5a2969d5add8b76fe752 Parents: ceed3a2 Author: Dave Brosius Authored: Fri Dec 5 21:16:54 2014 -0500 Committer: Dave Brosius Committed: Fri Dec 5 21:16:54 2014 -0500 -- src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9109302/src/java/org/apache/cassandra/db/ColumnFamilyStore.java -- diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java index b5c6c98..0e7e5f2 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@ -1855,14 +1855,14 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean if (sstable == null || !sstable.acquireReference()) { if (logger.isDebugEnabled()) -logger.debug("using snapshot sstable " + entries.getKey()); +logger.debug("using snapshot sstable {}", entries.getKey()); sstable = SSTableReader.open(entries.getKey(), entries.getValue(), metadata, partitioner); // This is technically not necessary since it's a snapshot but makes things easier sstable.acquireReference(); } else if (logger.isDebugEnabled()) { -logger.debug("using active sstable " + entries.getKey()); +logger.debug("using active sstable {}", entries.getKey()); } readers.add(sstable); }
cassandra git commit: use parameterized logging
Repository: cassandra Updated Branches: refs/heads/trunk 25a0a7130 -> 630e47ba4 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/630e47ba Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/630e47ba Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/630e47ba Branch: refs/heads/trunk Commit: 630e47ba4cd7fe7264f7373b3432ca96a38a6610 Parents: 25a0a71 Author: Dave Brosius Authored: Fri Nov 28 21:53:29 2014 -0500 Committer: Dave Brosius Committed: Fri Nov 28 21:53:29 2014 -0500 -- src/java/org/apache/cassandra/repair/RepairJob.java | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/630e47ba/src/java/org/apache/cassandra/repair/RepairJob.java -- diff --git a/src/java/org/apache/cassandra/repair/RepairJob.java b/src/java/org/apache/cassandra/repair/RepairJob.java index 34b4217..708ee70 100644 --- a/src/java/org/apache/cassandra/repair/RepairJob.java +++ b/src/java/org/apache/cassandra/repair/RepairJob.java @@ -203,7 +203,7 @@ public class RepairJob extends AbstractFuture implements Runnable Queue requests = new LinkedList<>(endpoints); InetAddress address = requests.poll(); ValidationTask firstTask = new ValidationTask(desc, address, gcBefore); -logger.info("Validating " + address); +logger.info("Validating {}", address); session.waitForValidation(Pair.create(desc, address), firstTask); tasks.add(firstTask); ValidationTask currentTask = firstTask; @@ -216,7 +216,7 @@ public class RepairJob extends AbstractFuture implements Runnable { public void onSuccess(TreeResponse result) { -logger.info("Validating " + nextAddress); +logger.info("Validating {}", nextAddress); session.waitForValidation(Pair.create(desc, nextAddress), nextTask); taskExecutor.execute(nextTask); } @@ -257,7 +257,7 @@ public class RepairJob extends AbstractFuture implements Runnable Queue requests = entry.getValue(); InetAddress address = requests.poll(); ValidationTask firstTask = new ValidationTask(desc, address, gcBefore); -logger.info("Validating " + address); +logger.info("Validating {}", address); session.waitForValidation(Pair.create(desc, address), firstTask); tasks.add(firstTask); ValidationTask currentTask = firstTask; @@ -270,7 +270,7 @@ public class RepairJob extends AbstractFuture implements Runnable { public void onSuccess(TreeResponse result) { -logger.info("Validating " + nextAddress); +logger.info("Validating {}", nextAddress); session.waitForValidation(Pair.create(desc, nextAddress), nextTask); taskExecutor.execute(nextTask); }