cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Mon, 19 May 2014 12:35:57 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java


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

Branch: refs/heads/trunk
Commit: 518c3cf61679654545d7dd07fd6ca8efd8428389
Parents: 66a3da0 e3a88b9
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Mon May 19 14:32:54 2014 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Mon May 19 14:32:54 2014 +0200

----------------------------------------------------------------------
 CHANGES.txt                                                 | 1 +
 .../apache/cassandra/db/compaction/CompactionManager.java   | 6 +++---
 .../org/apache/cassandra/metrics/ColumnFamilyMetrics.java   | 9 +++++++++
 3 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/518c3cf6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index eda9fd8,ed818db..860e8e2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -35,9 -28,10 +35,10 @@@ Merged from 2.0
   * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198)
   * Fix the InvertedIndex trigger example (CASSANDRA-7211)
   * Add --resolve-ip option to 'nodetool ring' (CASSANDRA-7210)
 - * Fix duplicated error messages on directory creation error at startup (CASSANDRA-5818)
   * reduce garbage on codec flag deserialization (CASSANDRA-7244) 
 + * Fix duplicated error messages on directory creation error at startup (CASSANDRA-5818)
   * Proper null handle for IF with map element access (CASSANDRA-7155)
+  * Improve compaction visibility (CASSANDRA-7242)
  Merged from 1.2:
   * Add Cloudstack snitch (CASSANDRA-7147)
   * Update system.peers correctly when relocating tokens (CASSANDRA-7126)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/518c3cf6/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/518c3cf6/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
index efbf60e,8880485..f080fd0
--- a/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
@@@ -62,7 -55,9 +62,9 @@@ public class ColumnFamilyMetric
      /** (Local) write metrics */
      public final LatencyMetrics writeLatency;
      /** Estimated number of tasks pending for this column family */
 -    public final Gauge<Integer> pendingTasks;
 +    public final Counter pendingFlushes;
+     /** Estimate of number of pending compactios for this CF */
+     public final Gauge<Integer> pendingCompactions;
      /** Number of SSTables on disk for this CF */
      public final Gauge<Integer> liveSSTableCount;
      /** Disk space used by SSTables belonging to this CF */
@@@ -231,7 -177,21 +233,14 @@@
          });
          readLatency = new LatencyMetrics(factory, "Read");
          writeLatency = new LatencyMetrics(factory, "Write");
 +        pendingFlushes = Metrics.newCounter(factory.createMetricName("PendingFlushes"));
+         pendingCompactions = Metrics.newGauge(factory.createMetricName("PendingCompactions"),
new Gauge<Integer>()
+         {
+             public Integer value()
+             {
+                 return cfs.getCompactionStrategy().getEstimatedRemainingTasks();
+             }
+         });
 -        pendingTasks = Metrics.newGauge(factory.createMetricName("PendingTasks"), new Gauge<Integer>()
 -        {
 -            public Integer value()
 -            {
 -                // TODO this actually isn't a good measure of pending tasks
 -                return Keyspace.switchLock.getQueueLength();
 -            }
 -        });
          liveSSTableCount = Metrics.newGauge(factory.createMetricName("LiveSSTableCount"),
new Gauge<Integer>()
          {
              public Integer value()


Mime
View raw message