cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Wed, 19 Aug 2015 14:29:52 GMT
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: cabdb03a9f63a05d1f6e3b27fafde8b2e6385c23
Parents: b83b674 96d41f0
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Wed Aug 19 17:30:00 2015 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Wed Aug 19 17:30:00 2015 +0300

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 NEWS.txt                                        |   9 +-
 conf/cassandra.yaml                             |  13 +
 .../org/apache/cassandra/config/Config.java     |   7 +-
 .../cassandra/config/DatabaseDescriptor.java    |  51 +-
 .../apache/cassandra/db/BatchlogManager.java    |  84 ++-
 .../cassandra/db/HintedHandOffManager.java      | 543 +------------------
 .../cassandra/db/HintedHandOffManagerMBean.java |   1 +
 src/java/org/apache/cassandra/db/Mutation.java  |  33 +-
 .../org/apache/cassandra/db/SystemKeyspace.java |  31 +-
 .../cassandra/db/commitlog/CommitLog.java       |  20 +-
 src/java/org/apache/cassandra/gms/Gossiper.java |  14 +
 .../cassandra/hints/ChecksummedDataInput.java   | 114 ++++
 .../cassandra/hints/EncodedHintMessage.java     |  89 +++
 src/java/org/apache/cassandra/hints/Hint.java   | 130 +++++
 .../org/apache/cassandra/hints/HintMessage.java | 130 +++++
 .../apache/cassandra/hints/HintResponse.java    |  58 ++
 .../apache/cassandra/hints/HintVerbHandler.java |  89 +++
 .../org/apache/cassandra/hints/HintsBuffer.java | 261 +++++++++
 .../apache/cassandra/hints/HintsBufferPool.java | 120 ++++
 .../apache/cassandra/hints/HintsCatalog.java    | 128 +++++
 .../apache/cassandra/hints/HintsDescriptor.java | 242 +++++++++
 .../cassandra/hints/HintsDispatchExecutor.java  | 199 +++++++
 .../cassandra/hints/HintsDispatchTrigger.java   |  85 +++
 .../apache/cassandra/hints/HintsDispatcher.java | 228 ++++++++
 .../org/apache/cassandra/hints/HintsReader.java | 312 +++++++++++
 .../apache/cassandra/hints/HintsService.java    | 291 ++++++++++
 .../cassandra/hints/HintsServiceMBean.java      |  43 ++
 .../org/apache/cassandra/hints/HintsStore.java  | 210 +++++++
 .../cassandra/hints/HintsWriteExecutor.java     | 235 ++++++++
 .../org/apache/cassandra/hints/HintsWriter.java | 272 ++++++++++
 .../cassandra/hints/LegacyHintsMigrator.java    | 243 +++++++++
 .../apache/cassandra/hints/package-info.java    |  44 ++
 .../cassandra/metrics/HintedHandoffMetrics.java |   3 +-
 .../cassandra/metrics/HintsServiceMetrics.java  |  25 +
 .../apache/cassandra/net/MessagingService.java  |   9 +-
 .../cassandra/service/CassandraDaemon.java      |   4 +
 .../apache/cassandra/service/StartupChecks.java |  43 +-
 .../apache/cassandra/service/StorageProxy.java  | 209 +++----
 .../cassandra/service/StorageService.java       |  68 ++-
 .../org/apache/cassandra/tools/NodeProbe.java   |   2 +-
 .../org/apache/cassandra/utils/FBUtilities.java |  32 +-
 .../org/apache/cassandra/utils/Throwables.java  |  90 ++-
 test/conf/cassandra.yaml                        |   1 +
 .../cassandra/hints/HintsWriteThenReadTest.java | 191 +++++++
 .../OffsetAwareConfigurationLoader.java         |   1 +
 .../apache/cassandra/db/HintedHandOffTest.java  | 150 -----
 .../cassandra/db/commitlog/CommitLogTest.java   |   4 +-
 .../hints/ChecksummedDataInputTest.java         | 112 ++++
 .../apache/cassandra/hints/HintMessageTest.java |  79 +++
 .../org/apache/cassandra/hints/HintTest.java    | 231 ++++++++
 .../apache/cassandra/hints/HintsBufferTest.java | 236 ++++++++
 .../cassandra/hints/HintsCatalogTest.java       |  88 +++
 .../cassandra/hints/HintsDescriptorTest.java    | 153 ++++++
 .../apache/cassandra/hints/HintsTestUtil.java   |  60 ++
 .../hints/LegacyHintsMigratorTest.java          | 195 +++++++
 .../metrics/HintedHandOffMetricsTest.java       |  56 ++
 .../cassandra/service/StorageProxyTest.java     |   3 +-
 58 files changed, 5468 insertions(+), 907 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cabdb03a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index eba9e36,0d17235..a78a19c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 +3.2
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0.0-beta1
+  * Rewrite hinted handoff (CASSANDRA-6230)
   * Fix query on static compact tables (CASSANDRA-10093)
   * Fix race during construction of commit log (CASSANDRA-10049)
   * Add option to only purge repaired tombstones (CASSANDRA-6434)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cabdb03a/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/config/Config.java
index f8f34e0,762935d..c9f2ec2
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@@ -169,8 -170,9 +170,10 @@@ public class Confi
      public int commitlog_segment_size_in_mb = 32;
      public ParameterizedClass commitlog_compression;
      public int commitlog_max_compression_buffers_in_pool = 3;
 +    public TransparentDataEncryptionOptions transparent_data_encryption_options = new TransparentDataEncryptionOptions();
  
+     public Integer max_mutation_size_in_kb;
+ 
      @Deprecated
      public int commitlog_periodic_queue_size = -1;
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cabdb03a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 371a3b1,b3bc4d2..ba32b1d
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@@ -616,9 -629,10 +631,14 @@@ public class DatabaseDescripto
          if (conf.user_defined_function_fail_timeout < conf.user_defined_function_warn_timeout)
              throw new ConfigurationException("user_defined_function_warn_timeout must less
than user_defined_function_fail_timeout", false);
  
 +        // always attempt to load the cipher factory, as we could be in the situation where
the user has disabled encryption,
 +        // but has existing commitlogs and sstables on disk that are still encrypted (and
still need to be read)
 +        encryptionContext = new EncryptionContext(config.transparent_data_encryption_options);
++
+         if (conf.max_mutation_size_in_kb == null)
+             conf.max_mutation_size_in_kb = conf.commitlog_segment_size_in_mb * 1024 / 2;
+         else if (conf.commitlog_segment_size_in_mb * 1024 < 2 * conf.max_mutation_size_in_kb)
+             throw new ConfigurationException("commitlog_segment_size_in_mb must be at least
twice the size of max_mutation_size_in_kb / 1024", false);
      }
  
      private static IEndpointSnitch createEndpointSnitch(String snitchClassName) throws ConfigurationException


Mime
View raw message