cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [05/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Wed, 10 Aug 2016 18:44:27 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.9
Commit: 2691c9e4e12a72f143bb2f00d076ecbfad59f4e4
Parents: 465def8 2e90259
Author: T Jake Luciani <jake@apache.org>
Authored: Wed Aug 10 14:39:52 2016 -0400
Committer: T Jake Luciani <jake@apache.org>
Committed: Wed Aug 10 14:39:52 2016 -0400

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../metrics/CassandraMetricsRegistry.java       |   4 +-
 .../cassandra/metrics/ClearableHistogram.java   |   4 +-
 .../DecayingEstimatedHistogramReservoir.java    | 549 +++++++++++++++++++
 .../metrics/EstimatedHistogramReservoir.java    | 111 ----
 .../cassandra/utils/EstimatedHistogram.java     |   2 +-
 ...DecayingEstimatedHistogramReservoirTest.java | 381 +++++++++++++
 7 files changed, 936 insertions(+), 116 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2691c9e4/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 86746ad,05059cc..e1bc9f3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,37 -1,7 +1,38 @@@
 -2.2.8
 +3.0.9
 + * Fix potential bad messaging service message for paged range reads
 +   within mixed-version 3.x clusters (CASSANDRA-12249)
 + * Change commitlog and sstables to track dirty and clean intervals (CASSANDRA-11828)
 + * NullPointerException during compaction on table with static columns (CASSANDRA-12336)
 + * Fixed ConcurrentModificationException when reading metrics in GraphiteReporter (CASSANDRA-11823)
 + * Fix upgrade of super columns on thrift (CASSANDRA-12335)
 + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and increased
corruption size (CASSANDRA-12359)
 + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness (CASSANDRA-12277)
 + * Exception when computing read-repair for range tombstones (CASSANDRA-12263)
 + * Lost counter writes in compact table and static columns (CASSANDRA-12219)
 + * AssertionError with MVs on updating a row that isn't indexed due to a null value (CASSANDRA-12247)
 + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980)
 + * Add option to override compaction space check (CASSANDRA-12180)
 + * Faster startup by only scanning each directory for temporary files once (CASSANDRA-12114)
 + * Respond with v1/v2 protocol header when responding to driver that attempts
 +   to connect with too low of a protocol version (CASSANDRA-11464)
 + * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
 + * Fix problem with undeleteable rows on upgrade to new sstable format (CASSANDRA-12144)
 + * Fix paging logic for deleted partitions with static columns (CASSANDRA-12107)
 + * Wait until the message is being send to decide which serializer must be used (CASSANDRA-11393)
 + * Fix migration of static thrift column names with non-text comparators (CASSANDRA-12147)
 + * Fix upgrading sparse tables that are incorrectly marked as dense (CASSANDRA-11315)
 + * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
 + * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
 + * Avoid missing sstables when getting the canonical sstables (CASSANDRA-11996)
 + * Always select the live sstables when getting sstables in bounds (CASSANDRA-11944)
 + * Fix column ordering of results with static columns for Thrift requests in
 +   a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
 +   those static columns in query results (CASSANDRA-12123)
 + * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
 + * Fix EOF exception when altering column type (CASSANDRA-11820)
 +Merged from 2.2:
+  * Add decay to histograms and timers used for metrics (CASSANDRA-11752)
   * Fix hanging stream session (CASSANDRA-10992)
 - * Add byteman support for testing (CASSANDRA-12377)
   * Fix INSERT JSON, fromJson() support of smallint, tinyint types (CASSANDRA-12371)
   * Restore JVM metric export for metric reporters (CASSANDRA-12312)
   * Release sstables of failed stream sessions only when outgoing transfers are finished
(CASSANDRA-11345)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2691c9e4/src/java/org/apache/cassandra/metrics/CassandraMetricsRegistry.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/metrics/CassandraMetricsRegistry.java
index 1cd3b6c,8e5671b..2d4cbf9
--- a/src/java/org/apache/cassandra/metrics/CassandraMetricsRegistry.java
+++ b/src/java/org/apache/cassandra/metrics/CassandraMetricsRegistry.java
@@@ -65,31 -58,17 +65,31 @@@ public class CassandraMetricsRegistry e
          return meter;
      }
  
 +    public Meter meter(MetricName name, MetricName alias)
 +    {
 +        Meter meter = meter(name);
 +        registerAlias(name, alias);
 +        return meter;
 +    }
 +
      public Histogram histogram(MetricName name, boolean considerZeroes)
      {
-         Histogram histogram = register(name, new ClearableHistogram(new EstimatedHistogramReservoir(considerZeroes)));
+         Histogram histogram = register(name, new ClearableHistogram(new DecayingEstimatedHistogramReservoir(considerZeroes)));
          registerMBean(histogram, name.getMBeanName());
  
          return histogram;
      }
  
 +    public Histogram histogram(MetricName name, MetricName alias, boolean considerZeroes)
 +    {
 +        Histogram histogram = histogram(name, considerZeroes);
 +        registerAlias(name, alias);
 +        return histogram;
 +    }
 +
      public Timer timer(MetricName name)
      {
-         Timer timer = register(name, new Timer(new EstimatedHistogramReservoir(false)));
+         Timer timer = register(name, new Timer(new DecayingEstimatedHistogramReservoir()));
          registerMBean(timer, name.getMBeanName());
  
          return timer;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2691c9e4/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
----------------------------------------------------------------------


Mime
View raw message