cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Date Wed, 01 Apr 2015 12:43:55 GMT
Merge branch 'cassandra-2.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d7076a4b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d7076a4b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d7076a4b

Branch: refs/heads/trunk
Commit: d7076a4b8a210c5166c96fec793644950b7d772c
Parents: 1b0a59e 730cc60
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Wed Apr 1 14:39:56 2015 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Wed Apr 1 14:39:56 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt                                                     | 1 +
 src/java/org/apache/cassandra/db/compaction/CompactionTask.java | 3 +++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d7076a4b/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d7076a4b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionTask.java
index 886ba34,392034c..0560328
--- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
@@@ -139,16 -137,10 +139,17 @@@ public class CompactionTask extends Abs
          // new sstables from flush can be added during a compaction, but only the compaction
can remove them,
          // so in our single-threaded compaction world this is a valid way of determining
if we're compacting
          // all the sstables (that existed when we started)
 -        logger.info("Compacting {}", sstables);
 +        StringBuilder ssTableLoggerMsg = new StringBuilder("[");
 +        for (SSTableReader sstr : sstables)
 +        {
 +            ssTableLoggerMsg.append(String.format("%s:level=%d, ", sstr.getFilename(), sstr.getSSTableLevel()));
 +        }
 +        ssTableLoggerMsg.append("]");
 +        String taskIdLoggerMsg = taskId == null ? UUIDGen.getTimeUUID().toString() : taskId.toString();
 +        logger.info("Compacting ({}) {}", taskIdLoggerMsg, ssTableLoggerMsg);
  
          long start = System.nanoTime();
+ 
          long totalKeysWritten = 0;
  
          try (CompactionController controller = getCompactionController(sstables);)


Mime
View raw message