cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/3] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Mon, 19 Oct 2015 14:57:36 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/7159a754
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7159a754
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7159a754

Branch: refs/heads/trunk
Commit: 7159a754a5fcaa1b78a53089267ea7506e32e81d
Parents: cf0c61b 3cd7500
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Mon Oct 19 15:57:04 2015 +0100
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Mon Oct 19 15:57:04 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  3 +
 .../apache/cassandra/gms/FailureDetector.java   | 82 +++++++++++++++-----
 .../cassandra/gms/FailureDetectorMBean.java     |  5 ++
 .../org/apache/cassandra/tools/NodeProbe.java   | 14 +++-
 .../org/apache/cassandra/tools/NodeTool.java    |  3 +-
 .../tools/nodetool/FailureDetectorInfo.java     | 46 +++++++++++
 6 files changed, 133 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7159a754/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 9b86ebd,3eff22c..5a118ca
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,31 -1,18 +1,34 @@@
 -2.2.4
 +3.0
++Merged from 2.2:
+  * Expose phi values from failure detector via JMX and tweak debug
+    and trace logging (CASSANDRA-9526)
 - * Fix RangeNamesQueryPager (CASSANDRA-10509)
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  Merged from 2.1:
   * AssertionError: attempted to delete non-existing file CommitLog (CASSANDRA-10377)
 - * (cqlsh) Distinguish negative and positive infinity in output (CASSANDRA-10523)
 - * (cqlsh) allow custom time_format for COPY TO (CASSANDRA-8970)
 - * Don't allow startup if the node's rack has changed (CASSANDRA-10242)
 - * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)
  
  
 -2.2.3
 +3.0-rc2
 + * Fix SELECT DISTINCT queries between 2.2.2 nodes and 3.0 nodes (CASSANDRA-10473)
 + * Remove circular references in SegmentedFile (CASSANDRA-10543)
 + * Ensure validation of indexed values only occurs once per-partition (CASSANDRA-10536)
 + * Fix handling of static columns for range tombstones in thrift (CASSANDRA-10174)
 + * Support empty ColumnFilter for backward compatility on empty IN (CASSANDRA-10471)
 + * Remove Pig support (CASSANDRA-10542)
 + * Fix LogFile throws Exception when assertion is disabled (CASSANDRA-10522)
 + * Revert CASSANDRA-7486, make CMS default GC, move GC config to
 +   conf/jvm.options (CASSANDRA-10403)
 + * Fix TeeingAppender causing some logs to be truncated/empty (CASSANDRA-10447)
 + * Allow EACH_QUORUM for reads (CASSANDRA-9602)
 + * Fix potential ClassCastException while upgrading (CASSANDRA-10468)
 + * Fix NPE in MVs on update (CASSANDRA-10503)
 + * Only include modified cell data in indexing deltas (CASSANDRA-10438)
 + * Do not load keyspace when creating sstable writer (CASSANDRA-10443)
 + * If node is not yet gossiping write all MV updates to batchlog only (CASSANDRA-10413)
 + * Re-populate token metadata after commit log recovery (CASSANDRA-10293)
 + * Provide additional metrics for materialized views (CASSANDRA-10323)
 + * Flush system schema tables after local schema changes (CASSANDRA-10429)
 +Merged from 2.2:
 + * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
 + * Fix the regression when using LIMIT with aggregates (CASSANDRA-10487)
   * Avoid NoClassDefFoundError during DataDescriptor initialization on windows (CASSANDRA-10412)
   * Preserve case of quoted Role & User names (CASSANDRA-10394)
   * cqlsh pg-style-strings broken (CASSANDRA-10484)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7159a754/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/NodeProbe.java
index d07a54c,62795b5..b4821f5
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@@ -527,18 -521,18 +527,18 @@@ public class NodeProbe implements AutoC
  
      /**
       * Take a snapshot of all column family from different keyspaces.
-      * 
+      *
       * @param snapshotName
       *            the name of the snapshot.
 -     * @param columnFamilyList
 +     * @param tableList
       *            list of columnfamily from different keyspace in the form of ks1.cf1 ks2.cf2
       */
 -    public void takeMultipleColumnFamilySnapshot(String snapshotName, String... columnFamilyList)
 +    public void takeMultipleTableSnapshot(String snapshotName, String... tableList)
              throws IOException
      {
 -        if (null != columnFamilyList && columnFamilyList.length != 0)
 +        if (null != tableList && tableList.length != 0)
          {
 -            ssProxy.takeMultipleColumnFamilySnapshot(snapshotName, columnFamilyList);
 +            ssProxy.takeMultipleTableSnapshot(snapshotName, tableList);
          }
          else
          {
@@@ -1293,17 -1277,17 +1293,29 @@@
          }
      }
  
 +    public void replayBatchlog() throws IOException
 +    {
 +        try
 +        {
 +            bmProxy.forceBatchlogReplay();
 +        }
 +        catch (Exception e)
 +        {
 +            throw new IOException(e);
 +        }
 +    }
++
+     public TabularData getFailureDetectorPhilValues()
+     {
+         try
+         {
+             return fdProxy.getPhiValues();
+         }
+         catch (OpenDataException e)
+         {
+             throw new RuntimeException(e);
+         }
+     }
  }
  
  class ColumnFamilyStoreMBeanIterator implements Iterator<Map.Entry<String, ColumnFamilyStoreMBean>>

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7159a754/src/java/org/apache/cassandra/tools/NodeTool.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/NodeTool.java
index afee17a,175b325..e4bed4c
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@@ -131,8 -130,7 +131,9 @@@ public class NodeToo
                  TopPartitions.class,
                  SetLoggingLevel.class,
                  GetLoggingLevels.class,
 +                DisableHintsForDC.class,
-                 EnableHintsForDC.class
++                EnableHintsForDC.class,
+                 FailureDetectorInfo.class
          );
  
          Cli.CliBuilder<Runnable> builder = Cli.builder("nodetool");


Mime
View raw message