You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/08/24 07:04:39 UTC
git commit: switch to use parameterized logging
Updated Branches:
refs/heads/trunk 8d1fc5827 -> cd6aa2d1e
switch to 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/cd6aa2d1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd6aa2d1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd6aa2d1
Branch: refs/heads/trunk
Commit: cd6aa2d1ef16a8af2e5e3de20e2389575d8021e1
Parents: 8d1fc58
Author: Dave Brosius <db...@apache.org>
Authored: Sat Aug 24 01:04:04 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Sat Aug 24 01:04:04 2013 -0400
----------------------------------------------------------------------
.../cassandra/config/DatabaseDescriptor.java | 24 ++++++++++----------
.../cassandra/db/BlacklistedDirectories.java | 2 +-
.../apache/cassandra/db/ColumnFamilyStore.java | 15 ++++++------
.../db/CounterMutationVerbHandler.java | 2 +-
.../db/DefinitionsUpdateVerbHandler.java | 2 +-
.../org/apache/cassandra/db/DefsTables.java | 2 +-
.../org/apache/cassandra/db/Directories.java | 2 +-
.../cassandra/db/HintedHandOffManager.java | 2 +-
src/java/org/apache/cassandra/db/Keyspace.java | 2 +-
src/java/org/apache/cassandra/db/Memtable.java | 2 +-
.../cassandra/db/commitlog/CommitLog.java | 4 ++--
.../db/commitlog/CommitLogReplayer.java | 10 ++++----
.../db/commitlog/CommitLogSegment.java | 4 ++--
.../db/compaction/CompactionManager.java | 4 ++--
.../cassandra/db/compaction/CompactionTask.java | 4 ++--
.../db/compaction/LeveledManifest.java | 2 +-
.../cassandra/db/context/CounterContext.java | 2 +-
.../AbstractSimplePerColumnSecondaryIndex.java | 2 +-
.../cassandra/db/index/SecondaryIndex.java | 2 +-
.../db/index/SecondaryIndexManager.java | 2 +-
.../org/apache/cassandra/dht/RangeStreamer.java | 2 +-
.../apache/cassandra/gms/FailureDetector.java | 2 +-
.../gms/GossipDigestSynVerbHandler.java | 4 ++--
src/java/org/apache/cassandra/gms/Gossiper.java | 24 ++++++++++----------
24 files changed, 61 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd6aa2d1/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index f1e065f..ba7b377 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -129,8 +129,8 @@ public class DatabaseDescriptor
{
conf = config;
- logger.info("Data files directories: " + Arrays.toString(conf.data_file_directories));
- logger.info("Commit log directory: " + conf.commitlog_directory);
+ logger.info("Data files directories: {}", Arrays.toString(conf.data_file_directories));
+ logger.info("Commit log directory: {}", conf.commitlog_directory);
if (conf.commitlog_sync == null)
{
@@ -147,7 +147,7 @@ public class DatabaseDescriptor
{
throw new ConfigurationException("Batch sync specified, but commitlog_sync_period_in_ms found. Only specify commitlog_sync_batch_window_in_ms when using batch sync");
}
- logger.debug("Syncing log with a batch window of " + conf.commitlog_sync_batch_window_in_ms);
+ logger.debug("Syncing log with a batch window of {}", conf.commitlog_sync_batch_window_in_ms);
}
else
{
@@ -159,7 +159,7 @@ public class DatabaseDescriptor
{
throw new ConfigurationException("commitlog_sync_period_in_ms specified, but commitlog_sync_batch_window_in_ms found. Only specify commitlog_sync_period_in_ms when using periodic sync.");
}
- logger.debug("Syncing log with a period of " + conf.commitlog_sync_period_in_ms);
+ logger.debug("Syncing log with a period of {}", conf.commitlog_sync_period_in_ms);
}
if (conf.commitlog_total_space_in_mb == null)
@@ -170,21 +170,21 @@ public class DatabaseDescriptor
{
conf.disk_access_mode = System.getProperty("os.arch").contains("64") ? Config.DiskAccessMode.mmap : Config.DiskAccessMode.standard;
indexAccessMode = conf.disk_access_mode;
- logger.info("DiskAccessMode 'auto' determined to be " + conf.disk_access_mode + ", indexAccessMode is " + indexAccessMode );
+ logger.info("DiskAccessMode 'auto' determined to be {}, indexAccessMode is {}", conf.disk_access_mode, indexAccessMode);
}
else if (conf.disk_access_mode == Config.DiskAccessMode.mmap_index_only)
{
conf.disk_access_mode = Config.DiskAccessMode.standard;
indexAccessMode = Config.DiskAccessMode.mmap;
- logger.info("DiskAccessMode is " + conf.disk_access_mode + ", indexAccessMode is " + indexAccessMode );
+ logger.info("DiskAccessMode is {}, indexAccessMode is {}", conf.disk_access_mode, indexAccessMode);
}
else
{
indexAccessMode = conf.disk_access_mode;
- logger.info("DiskAccessMode is " + conf.disk_access_mode + ", indexAccessMode is " + indexAccessMode );
+ logger.info("DiskAccessMode is {}, indexAccessMode is {}", conf.disk_access_mode, indexAccessMode);
}
- logger.info("disk_failure_policy is " + conf.disk_failure_policy);
+ logger.info("disk_failure_policy is {}", conf.disk_failure_policy);
/* Authentication and authorization backend, implementing IAuthenticator and IAuthorizer */
if (conf.authenticator != null)
@@ -371,10 +371,10 @@ public class DatabaseDescriptor
if (logger.isDebugEnabled() && conf.auto_bootstrap != null)
{
- logger.debug("setting auto_bootstrap to " + conf.auto_bootstrap);
+ logger.debug("setting auto_bootstrap to {}", conf.auto_bootstrap);
}
- logger.info((conf.multithreaded_compaction ? "" : "Not ") + "using multi-threaded compaction");
+ logger.info("{}using multi-threaded compaction", (conf.multithreaded_compaction ? "" : "Not "));
if (conf.in_memory_compaction_limit_in_mb != null && conf.in_memory_compaction_limit_in_mb <= 0)
{
@@ -574,13 +574,13 @@ public class DatabaseDescriptor
}
catch (ConfigurationException e)
{
- logger.error("Fatal error: " + e.getMessage());
+ logger.error("Fatal error: {}", e.getMessage());
System.err.println("Bad configuration; unable to start server");
System.exit(1);
}
catch (FSWriteError e)
{
- logger.error("Fatal error: " + e.getMessage());
+ logger.error("Fatal error: {}", e.getMessage());
System.err.println(e.getCause().getMessage() + "; unable to start server");
System.exit(1);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd6aa2d1/src/java/org/apache/cassandra/db/BlacklistedDirectories.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/BlacklistedDirectories.java b/src/java/org/apache/cassandra/db/BlacklistedDirectories.java
index 999483f..de6c968 100644
--- a/src/java/org/apache/cassandra/db/BlacklistedDirectories.java
+++ b/src/java/org/apache/cassandra/db/BlacklistedDirectories.java
@@ -48,7 +48,7 @@ public class BlacklistedDirectories implements BlacklistedDirectoriesMBean
}
catch (Exception e)
{
- logger.error("error registering MBean " + MBEAN_NAME, e);
+ logger.error("error registering MBean {}", MBEAN_NAME, e);
//Allow the server to start even if the bean can't be registered
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd6aa2d1/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 20ae158..cdd7635 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -335,7 +335,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
catch (Exception e)
{
// this shouldn't block anything.
- logger.warn("Failed unregistering mbean: " + mbeanName, e);
+ logger.warn("Failed unregistering mbean: {}", mbeanName, e);
}
}
@@ -455,7 +455,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
for (File file : dir.listFiles())
if (tmpCacheFilePattern.matcher(file.getName()).matches())
if (!file.delete())
- logger.warn("could not delete " + file.getAbsolutePath());
+ logger.warn("could not delete {}", file.getAbsolutePath());
}
// also clean out any index leftovers.
@@ -567,7 +567,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
*/
public synchronized void loadNewSSTables()
{
- logger.info("Loading new SSTables for " + keyspace.getName() + "/" + name + "...");
+ logger.info("Loading new SSTables for {}/{}...", keyspace.getName(), name);
Set<Descriptor> currentDescriptors = new HashSet<Descriptor>();
for (SSTableReader sstable : data.getView().sstables)
@@ -628,11 +628,11 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
if (newSSTables.isEmpty())
{
- logger.info("No new SSTables were found for " + keyspace.getName() + "/" + name);
+ logger.info("No new SSTables were found for {}/{}", keyspace.getName(), name);
return;
}
- logger.info("Loading new SSTables and building secondary indexes for " + keyspace.getName() + "/" + name + ": " + newSSTables);
+ logger.info("Loading new SSTables and building secondary indexes for {}/{}: {}", keyspace.getName(), name, newSSTables);
SSTableReader.acquireReferences(newSSTables);
data.addSSTables(newSSTables);
try
@@ -644,7 +644,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
SSTableReader.releaseReferences(newSSTables);
}
- logger.info("Done loading load new SSTables for " + keyspace.getName() + "/" + name);
+ logger.info("Done loading load new SSTables for {}/{}", keyspace.getName(), name);
}
public static void rebuildSecondaryIndex(String ksName, String cfName, String... idxNames)
@@ -1735,8 +1735,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
File snapshotDirectory = Directories.getSnapshotDirectory(ssTable.descriptor, snapshotName);
ssTable.createLinks(snapshotDirectory.getPath()); // hard links
if (logger.isDebugEnabled())
- logger.debug("Snapshot for " + keyspace + " keyspace data file " + ssTable.getFilename() +
- " created in " + snapshotDirectory);
+ logger.debug("Snapshot for {} keyspace data file {} created in {}", keyspace, ssTable.getFilename(), snapshotDirectory);
}
if (cfs.compactionStrategy instanceof LeveledCompactionStrategy)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd6aa2d1/src/java/org/apache/cassandra/db/CounterMutationVerbHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/CounterMutationVerbHandler.java b/src/java/org/apache/cassandra/db/CounterMutationVerbHandler.java
index c1cc95f..966a015 100644
--- a/src/java/org/apache/cassandra/db/CounterMutationVerbHandler.java
+++ b/src/java/org/apache/cassandra/db/CounterMutationVerbHandler.java
@@ -38,7 +38,7 @@ public class CounterMutationVerbHandler implements IVerbHandler<CounterMutation>
{
final CounterMutation cm = message.payload;
if (logger.isDebugEnabled())
- logger.debug("Applying forwarded " + cm);
+ logger.debug("Applying forwarded {}", cm);
String localDataCenter = DatabaseDescriptor.getEndpointSnitch().getDatacenter(FBUtilities.getBroadcastAddress());
// We should not wait for the result of the write in this thread,
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd6aa2d1/src/java/org/apache/cassandra/db/DefinitionsUpdateVerbHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/DefinitionsUpdateVerbHandler.java b/src/java/org/apache/cassandra/db/DefinitionsUpdateVerbHandler.java
index c4b9f84..cab094d 100644
--- a/src/java/org/apache/cassandra/db/DefinitionsUpdateVerbHandler.java
+++ b/src/java/org/apache/cassandra/db/DefinitionsUpdateVerbHandler.java
@@ -40,7 +40,7 @@ public class DefinitionsUpdateVerbHandler implements IVerbHandler<Collection<Row
public void doVerb(final MessageIn<Collection<RowMutation>> message, int id)
{
- logger.debug("Received schema mutation push from " + message.from);
+ logger.debug("Received schema mutation push from {}", message.from);
StageManager.getStage(Stage.MIGRATION).submit(new WrappedRunnable()
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd6aa2d1/src/java/org/apache/cassandra/db/DefsTables.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/DefsTables.java b/src/java/org/apache/cassandra/db/DefsTables.java
index bc2b36d..98905b1 100644
--- a/src/java/org/apache/cassandra/db/DefsTables.java
+++ b/src/java/org/apache/cassandra/db/DefsTables.java
@@ -338,7 +338,7 @@ public class DefsTables
KSMetaData ksm = Schema.instance.getKSMetaData(cfm.ksName);
ksm = KSMetaData.cloneWith(ksm, Iterables.concat(ksm.cfMetaData().values(), Collections.singleton(cfm)));
- logger.info("Loading " + cfm);
+ logger.info("Loading {}", cfm);
Schema.instance.load(cfm);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd6aa2d1/src/java/org/apache/cassandra/db/Directories.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Directories.java b/src/java/org/apache/cassandra/db/Directories.java
index 5a0ac22..576a1fa 100644
--- a/src/java/org/apache/cassandra/db/Directories.java
+++ b/src/java/org/apache/cassandra/db/Directories.java
@@ -442,7 +442,7 @@ public class Directories
if (snapshotDir.exists())
{
if (logger.isDebugEnabled())
- logger.debug("Removing snapshot directory " + snapshotDir);
+ logger.debug("Removing snapshot directory {}", snapshotDir);
FileUtils.deleteRecursive(snapshotDir);
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd6aa2d1/src/java/org/apache/cassandra/db/HintedHandOffManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/HintedHandOffManager.java b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
index 406f62d..9b4002a 100644
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@ -408,7 +408,7 @@ public class HintedHandOffManager implements HintedHandOffManagerMBean
if (hint.maxTimestamp() < truncatedAt)
{
- logger.debug("Skipping delivery of hint for truncated columnfamily {}" + cfId);
+ logger.debug("Skipping delivery of hint for truncated columnfamily {}", cfId);
rm = rm.without(cfId);
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd6aa2d1/src/java/org/apache/cassandra/db/Keyspace.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Keyspace.java b/src/java/org/apache/cassandra/db/Keyspace.java
index 667a656..3a90d58 100644
--- a/src/java/org/apache/cassandra/db/Keyspace.java
+++ b/src/java/org/apache/cassandra/db/Keyspace.java
@@ -365,7 +365,7 @@ public class Keyspace
ColumnFamilyStore cfs = columnFamilyStores.get(cf.id());
if (cfs == null)
{
- logger.error("Attempting to mutate non-existant column family " + cf.id());
+ logger.error("Attempting to mutate non-existant column family {}", cf.id());
continue;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd6aa2d1/src/java/org/apache/cassandra/db/Memtable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Memtable.java b/src/java/org/apache/cassandra/db/Memtable.java
index b3ea3a2..9caff12 100644
--- a/src/java/org/apache/cassandra/db/Memtable.java
+++ b/src/java/org/apache/cassandra/db/Memtable.java
@@ -386,7 +386,7 @@ public class Memtable
private SSTableReader writeSortedContents(Future<ReplayPosition> context, File sstableDirectory)
throws ExecutionException, InterruptedException
{
- logger.info("Writing " + Memtable.this.toString());
+ logger.info("Writing {}", Memtable.this.toString());
SSTableReader ssTable;
// errors when creating the writer that may leave empty temp files.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd6aa2d1/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java b/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
index 33f23a5..e049815 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
@@ -122,9 +122,9 @@ public class CommitLog implements CommitLogMBean
else
{
Arrays.sort(files, new CommitLogSegment.CommitLogSegmentFileComparator());
- logger.info("Replaying " + StringUtils.join(files, ", "));
+ logger.info("Replaying {}", StringUtils.join(files, ", "));
replayed = recover(files);
- logger.info("Log replay complete, " + replayed + " replayed mutations");
+ logger.info("Log replay complete, {} replayed mutations", replayed);
for (File f : files)
CommitLog.instance.allocator.recycleSegment(f);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd6aa2d1/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
index adf16c4..51a9915 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
@@ -115,7 +115,7 @@ public class CommitLogReplayer
public void recover(File file) throws IOException
{
- logger.info("Replaying " + file.getPath());
+ logger.info("Replaying {}", file.getPath());
CommitLogDescriptor desc = CommitLogDescriptor.fromFileName(file.getName());
final long segment = desc.id;
int version = desc.getMessagingVersion();
@@ -139,14 +139,14 @@ public class CommitLogReplayer
}
if (logger.isDebugEnabled())
- logger.debug("Replaying " + file + " starting at " + replayPosition);
+ logger.debug("Replaying {} starting at {}", file, replayPosition);
reader.seek(replayPosition);
/* read the logs populate RowMutation and apply */
while (!reader.isEOF())
{
if (logger.isDebugEnabled())
- logger.debug("Reading mutation at " + reader.getFilePointer());
+ logger.debug("Reading mutation at {}", reader.getFilePointer());
long claimedCRC32;
int serializedSize;
@@ -156,7 +156,7 @@ public class CommitLogReplayer
serializedSize = reader.readInt();
if (serializedSize == CommitLog.END_OF_SEGMENT_MARKER)
{
- logger.debug("Encountered end of segment marker at " + reader.getFilePointer());
+ logger.debug("Encountered end of segment marker at {}", reader.getFilePointer());
break;
}
@@ -278,7 +278,7 @@ public class CommitLogReplayer
finally
{
FileUtils.closeQuietly(reader);
- logger.info("Finished reading " + file);
+ logger.info("Finished reading {}", file);
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd6aa2d1/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 df3d257..2c7a848 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
@@ -168,7 +168,7 @@ public class CommitLogSegment
}
catch (FSWriteError e)
{
- logger.error("I/O error flushing " + this + " " + e);
+ logger.error("I/O error flushing {} {}", this, e.getMessage());
throw e;
}
@@ -197,7 +197,7 @@ public class CommitLogSegment
CFMetaData cfm = Schema.instance.getCFMetaData(columnFamily.id());
if (cfm == null)
{
- logger.error("Attempted to write commit log entry for unrecognized column family: " + columnFamily.id());
+ logger.error("Attempted to write commit log entry for unrecognized column family: {}", columnFamily.id());
}
else
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd6aa2d1/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 100c274..9a78648 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -551,9 +551,9 @@ public class CompactionManager implements CompactionManagerMBean
int expectedBloomFilterSize = Math.max(cfs.metadata.getIndexInterval(),
(int) (SSTableReader.getApproximateKeyCount(Arrays.asList(sstable), cfs.metadata)));
if (logger.isDebugEnabled())
- logger.debug("Expected bloom filter size : " + expectedBloomFilterSize);
+ logger.debug("Expected bloom filter size : {}", expectedBloomFilterSize);
- logger.info("Cleaning up " + sstable);
+ logger.info("Cleaning up {}", sstable);
// Calculate the expected compacted filesize
long expectedRangeFileSize = cfs.getExpectedCompactedFileSize(Arrays.asList(sstable), OperationType.CLEANUP);
File compactionFileLocation = cfs.directories.getDirectoryForNewSSTables(expectedRangeFileSize);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd6aa2d1/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
index c27a020..f4ad3ae 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
@@ -71,7 +71,7 @@ public class CompactionTask extends AbstractCompactionTask
if (partialCompactionsAcceptable() && toCompact.size() > 1)
{
// Try again w/o the largest one.
- logger.warn("insufficient space to compact all requested files " + StringUtils.join(toCompact, ", "));
+ logger.warn("insufficient space to compact all requested files {}", StringUtils.join(toCompact, ", "));
// Note that we have removed files that are still marked as compacting.
// This suboptimal but ok since the caller will unmark all the sstables at the end.
return toCompact.remove(cfs.getMaxSizeFile(toCompact));
@@ -121,7 +121,7 @@ public class CompactionTask extends AbstractCompactionTask
long estimatedSSTables = Math.max(1, SSTable.getTotalBytes(actuallyCompact) / strategy.getMaxSSTableSize());
long keysPerSSTable = (long) Math.ceil((double) estimatedTotalKeys / estimatedSSTables);
if (logger.isDebugEnabled())
- logger.debug("Expected bloom filter size : " + keysPerSSTable);
+ logger.debug("Expected bloom filter size : {}", keysPerSSTable);
AbstractCompactionIterable ci = DatabaseDescriptor.isMultithreadedCompaction()
? new ParallelCompactionIterable(compactionType, strategy.getScanners(actuallyCompact), controller)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd6aa2d1/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
index e46c060..55b0ac3 100644
--- a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
+++ b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
@@ -131,7 +131,7 @@ public class LeveledManifest
assert !Iterables.isEmpty(removed); // use add() instead of promote when adding new sstables
logDistribution();
if (logger.isDebugEnabled())
- logger.debug("Replacing [" + toString(removed) + "]");
+ logger.debug("Replacing [{}]", toString(removed));
// the level for the added sstables is the max of the removed ones,
// plus one if the removed were all on the same level
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd6aa2d1/src/java/org/apache/cassandra/db/context/CounterContext.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/context/CounterContext.java b/src/java/org/apache/cassandra/db/context/CounterContext.java
index e73a5e6..acb45c7 100644
--- a/src/java/org/apache/cassandra/db/context/CounterContext.java
+++ b/src/java/org/apache/cassandra/db/context/CounterContext.java
@@ -721,7 +721,7 @@ public class CounterContext implements IContext
}
else
{
- logger.debug("Ignoring non-removable non-delta corrupted shard in context " + toString(context));
+ logger.debug("Ignoring non-removable non-delta corrupted shard in context {}", toString(context));
state.moveToNext();
continue;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd6aa2d1/src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.java b/src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.java
index afc7409..b1b36f9 100644
--- a/src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.java
+++ b/src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.java
@@ -67,7 +67,7 @@ public abstract class AbstractSimplePerColumnSecondaryIndex extends PerColumnSec
double averageColumnCount = indexCfs.getMeanColumns();
if (averageColumnCount > 0 && estimatedKeys / averageColumnCount > 1)
{
- logger.debug("turning row cache on for " + indexCfs.name);
+ logger.debug("turning row cache on for {}", indexCfs.name);
indexCfs.metadata.caching(baseCaching);
indexCfs.initRowCache();
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd6aa2d1/src/java/org/apache/cassandra/db/index/SecondaryIndex.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/index/SecondaryIndex.java b/src/java/org/apache/cassandra/db/index/SecondaryIndex.java
index c712252..7cea5bf 100644
--- a/src/java/org/apache/cassandra/db/index/SecondaryIndex.java
+++ b/src/java/org/apache/cassandra/db/index/SecondaryIndex.java
@@ -188,7 +188,7 @@ public abstract class SecondaryIndex
forceBlockingFlush();
setIndexBuilt();
- logger.info("Index build of " + getIndexName() + " complete");
+ logger.info("Index build of {} complete", getIndexName());
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd6aa2d1/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
index 0286c6a..52ee6f0 100644
--- a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
+++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
@@ -143,7 +143,7 @@ public class SecondaryIndexManager
flushIndexesBlocking();
- logger.info("Index build of " + idxNames + " complete");
+ logger.info("Index build of {} complete", idxNames);
}
public boolean indexes(ByteBuffer name, Collection<SecondaryIndex> indexes)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd6aa2d1/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 f398862..1d24e5f 100644
--- a/src/java/org/apache/cassandra/dht/RangeStreamer.java
+++ b/src/java/org/apache/cassandra/dht/RangeStreamer.java
@@ -224,7 +224,7 @@ public class RangeStreamer
Collection<Range<Token>> ranges = entry.getValue().getValue();
/* Send messages to respective folks to stream data over to me */
if (logger.isDebugEnabled())
- logger.debug("" + description + "ing from " + source + " ranges " + StringUtils.join(ranges, ", "));
+ logger.debug("{}ing from {} ranges {}", description, source, StringUtils.join(ranges, ", "));
streamPlan.requestRanges(source, keyspace, ranges);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd6aa2d1/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 e8682d8..1ebfa96 100644
--- a/src/java/org/apache/cassandra/gms/FailureDetector.java
+++ b/src/java/org/apache/cassandra/gms/FailureDetector.java
@@ -151,7 +151,7 @@ public class FailureDetector implements IFailureDetector, FailureDetectorMBean
// it's worth being defensive here so minor bugs don't cause disproportionate
// badness. (See CASSANDRA-1463 for an example).
if (epState == null)
- logger.error("unknown endpoint " + ep);
+ logger.error("unknown endpoint {}", ep);
return epState != null && epState.isAlive();
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd6aa2d1/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 4b1564d..9747a09 100644
--- a/src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java
+++ b/src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java
@@ -49,13 +49,13 @@ public class GossipDigestSynVerbHandler implements IVerbHandler<GossipDigestSyn>
/* If the message is from a different cluster throw it away. */
if (!gDigestMessage.clusterId.equals(DatabaseDescriptor.getClusterName()))
{
- logger.warn("ClusterName mismatch from " + from + " " + gDigestMessage.clusterId + "!=" + DatabaseDescriptor.getClusterName());
+ logger.warn("ClusterName mismatch from {} {}!={}", from, gDigestMessage.clusterId, DatabaseDescriptor.getClusterName());
return;
}
if (gDigestMessage.partioner != null && !gDigestMessage.partioner.equals(DatabaseDescriptor.getPartitionerName()))
{
- logger.warn("Partitioner mismatch from " + from + " " + gDigestMessage.partioner + "!=" + DatabaseDescriptor.getPartitionerName());
+ logger.warn("Partitioner mismatch from {} {}!={}", from, gDigestMessage.partioner, DatabaseDescriptor.getPartitionerName());
return;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd6aa2d1/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 518b9ab..3878f4c 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -288,7 +288,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
expireTimeEndpointMap.remove(endpoint);
quarantineEndpoint(endpoint);
if (logger.isDebugEnabled())
- logger.debug("evicting " + endpoint + " from gossip");
+ logger.debug("evicting {} from gossip", endpoint);
}
/**
@@ -315,7 +315,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
quarantineEndpoint(endpoint);
MessagingService.instance().destroyConnectionPool(endpoint);
if (logger.isDebugEnabled())
- logger.debug("removing endpoint " + endpoint);
+ logger.debug("removing endpoint {}", endpoint);
}
/**
@@ -392,14 +392,14 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
// remember this node's generation
int generation = epState.getHeartBeatState().getGeneration();
logger.info("Removing host: {}", hostId);
- logger.info("Sleeping for " + StorageService.RING_DELAY + "ms to ensure " + endpoint + " does not change");
+ logger.info("Sleeping for {}ms to ensure {} does not change", StorageService.RING_DELAY, endpoint);
Uninterruptibles.sleepUninterruptibly(StorageService.RING_DELAY, TimeUnit.MILLISECONDS);
// make sure it did not change
epState = endpointStateMap.get(endpoint);
if (epState.getHeartBeatState().getGeneration() != generation)
throw new RuntimeException("Endpoint " + endpoint + " generation changed while trying to remove it");
// update the other node's generation to mimic it as if it had changed it itself
- logger.info("Advertising removal for " + endpoint);
+ logger.info("Advertising removal for {}", endpoint);
epState.updateTimestamp(); // make sure we don't evict it too soon
epState.getHeartBeatState().forceNewerGenerationUnsafe();
epState.addApplicationState(ApplicationState.STATUS, StorageService.instance.valueFactory.removingNonlocal(hostId));
@@ -421,7 +421,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
epState.getHeartBeatState().forceNewerGenerationUnsafe();
long expireTime = computeExpireTime();
epState.addApplicationState(ApplicationState.STATUS, StorageService.instance.valueFactory.removedNonlocal(hostId, expireTime));
- logger.info("Completing removal of " + endpoint);
+ logger.info("Completing removal of {}", endpoint);
addExpireTimeForEndpoint(endpoint, expireTime);
endpointStateMap.put(endpoint, epState);
// ensure at least one gossip round occurs before returning
@@ -461,7 +461,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
tokens = Collections.singletonList(StorageService.getPartitioner().getRandomToken());
}
int generation = epState.getHeartBeatState().getGeneration();
- logger.info("Sleeping for " + StorageService.RING_DELAY + "ms to ensure " + endpoint + " does not change");
+ logger.info("Sleeping for {}ms to ensure {} does not change", StorageService.RING_DELAY, endpoint);
Uninterruptibles.sleepUninterruptibly(StorageService.RING_DELAY, TimeUnit.MILLISECONDS);
// make sure it did not change
epState = endpointStateMap.get(endpoint);
@@ -592,7 +592,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
&& !justRemovedEndpoints.containsKey(endpoint)
&& TimeUnit.NANOSECONDS.toMillis(nowNano - epState.getUpdateTimestamp()) > FatClientTimeout)
{
- logger.info("FatClient " + endpoint + " has been silent for " + FatClientTimeout + "ms, removing from gossip");
+ logger.info("FatClient {} has been silent for {}ms, removing from gossip", endpoint, FatClientTimeout);
removeEndpoint(endpoint); // will put it in justRemovedEndpoints to respect quarantine delay
evictFromMembership(endpoint); // can get rid of the state immediately
}
@@ -604,7 +604,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
{
if (logger.isDebugEnabled())
{
- logger.debug("time is expiring for endpoint : " + endpoint + " (" + expireTime + ")");
+ logger.debug("time is expiring for endpoint : {} ({})", endpoint, expireTime);
}
evictFromMembership(endpoint);
}
@@ -618,7 +618,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
if ((now - entry.getValue()) > QUARANTINE_DELAY)
{
if (logger.isDebugEnabled())
- logger.debug(QUARANTINE_DELAY + " elapsed, " + entry.getKey() + " gossip quarantine over");
+ logger.debug("{} elapsed, {} gossip quarantine over", QUARANTINE_DELAY, entry.getKey());
justRemovedEndpoints.remove(entry.getKey());
}
}
@@ -785,7 +785,7 @@ 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);
@@ -837,7 +837,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
markAlive(ep, epState);
else
{
- logger.debug("Not marking " + ep + " alive due to dead state");
+ logger.debug("Not marking {} alive due to dead state", ep);
markDead(ep, epState);
}
for (IEndpointStateChangeSubscriber subscriber : subscribers)
@@ -1173,7 +1173,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
{
if (logger.isDebugEnabled())
{
- logger.debug("adding expire time for endpoint : " + endpoint + " (" + expireTime + ")");
+ logger.debug("adding expire time for endpoint : {} ({})", endpoint, expireTime);
}
expireTimeEndpointMap.put(endpoint, expireTime);
}