You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2016/03/17 17:07:08 UTC
[12/12] cassandra git commit: Merge branch 'cassandra-3.5' into trunk
Merge branch 'cassandra-3.5' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/68e6a833
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/68e6a833
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/68e6a833
Branch: refs/heads/trunk
Commit: 68e6a8333279cf2207ad35c68b8929ce4d153cf2
Parents: 7043744 587773f
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Mar 17 11:03:25 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Mar 17 11:03:25 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/db/ColumnFamilyStore.java | 2 +
.../org/apache/cassandra/db/Directories.java | 30 +
.../cassandra/db/SerializationHeader.java | 5 +
.../org/apache/cassandra/db/Serializers.java | 114 ++--
.../columniterator/AbstractSSTableIterator.java | 4 +-
.../EncryptedFileSegmentInputStream.java | 4 +-
.../cassandra/hints/ChecksummedDataInput.java | 8 +-
.../org/apache/cassandra/hints/HintMessage.java | 4 +-
.../io/compress/CompressedSequentialWriter.java | 8 +-
.../io/sstable/SSTableSimpleIterator.java | 11 +-
.../sstable/format/RangeAwareSSTableWriter.java | 8 +-
.../io/sstable/format/SSTableReader.java | 2 +-
.../io/sstable/format/SSTableWriter.java | 2 +-
.../io/sstable/format/big/BigTableWriter.java | 4 +-
.../cassandra/io/util/BytesReadTracker.java | 30 +
.../apache/cassandra/io/util/DataPosition.java | 21 +
.../apache/cassandra/io/util/FileDataInput.java | 8 +-
.../org/apache/cassandra/io/util/FileMark.java | 20 -
.../io/util/FileSegmentInputStream.java | 12 +-
.../cassandra/io/util/RandomAccessReader.java | 8 +-
.../cassandra/io/util/RewindableDataInput.java | 30 +
.../io/util/RewindableDataInputStreamPlus.java | 569 +++++++++++++++++++
.../cassandra/io/util/SequentialWriter.java | 6 +-
.../cassandra/io/util/TrackedDataInputPlus.java | 150 +++++
.../cassandra/io/util/TrackedInputStream.java | 76 +++
.../cassandra/service/StorageService.java | 1 +
.../cassandra/streaming/StreamReader.java | 85 ++-
.../compress/CompressedStreamReader.java | 18 +-
.../streaming/messages/FileMessageHeader.java | 4 +-
.../apache/cassandra/tools/nodetool/Repair.java | 2 +-
.../cassandra/utils/BytesReadTracker.java | 153 -----
.../cassandra/utils/CloseableIterator.java | 1 -
...acy_jb_clust_compact-jb-1-CompressionInfo.db | Bin 0 -> 83 bytes
..._tables-legacy_jb_clust_compact-jb-1-Data.db | Bin 0 -> 5270 bytes
...ables-legacy_jb_clust_compact-jb-1-Filter.db | Bin 0 -> 24 bytes
...tables-legacy_jb_clust_compact-jb-1-Index.db | Bin 0 -> 157685 bytes
...s-legacy_jb_clust_compact-jb-1-Statistics.db | Bin 0 -> 6791 bytes
...bles-legacy_jb_clust_compact-jb-1-Summary.db | Bin 0 -> 71 bytes
..._tables-legacy_jb_clust_compact-jb-1-TOC.txt | 7 +
...lust_counter_compact-jb-1-CompressionInfo.db | Bin 0 -> 75 bytes
...legacy_jb_clust_counter_compact-jb-1-Data.db | Bin 0 -> 4228 bytes
...gacy_jb_clust_counter_compact-jb-1-Filter.db | Bin 0 -> 24 bytes
...egacy_jb_clust_counter_compact-jb-1-Index.db | Bin 0 -> 157685 bytes
..._jb_clust_counter_compact-jb-1-Statistics.db | Bin 0 -> 6791 bytes
...acy_jb_clust_counter_compact-jb-1-Summary.db | Bin 0 -> 71 bytes
...legacy_jb_clust_counter_compact-jb-1-TOC.txt | 7 +
...cy_jb_simple_compact-jb-1-CompressionInfo.db | Bin 0 -> 43 bytes
...tables-legacy_jb_simple_compact-jb-1-Data.db | Bin 0 -> 108 bytes
...bles-legacy_jb_simple_compact-jb-1-Filter.db | Bin 0 -> 24 bytes
...ables-legacy_jb_simple_compact-jb-1-Index.db | Bin 0 -> 75 bytes
...-legacy_jb_simple_compact-jb-1-Statistics.db | Bin 0 -> 4395 bytes
...les-legacy_jb_simple_compact-jb-1-Summary.db | Bin 0 -> 71 bytes
...tables-legacy_jb_simple_compact-jb-1-TOC.txt | 7 +
...mple_counter_compact-jb-1-CompressionInfo.db | Bin 0 -> 43 bytes
...egacy_jb_simple_counter_compact-jb-1-Data.db | Bin 0 -> 118 bytes
...acy_jb_simple_counter_compact-jb-1-Filter.db | Bin 0 -> 24 bytes
...gacy_jb_simple_counter_compact-jb-1-Index.db | Bin 0 -> 75 bytes
...jb_simple_counter_compact-jb-1-Statistics.db | Bin 0 -> 4395 bytes
...cy_jb_simple_counter_compact-jb-1-Summary.db | Bin 0 -> 71 bytes
...egacy_jb_simple_counter_compact-jb-1-TOC.txt | 7 +
...acy_ka_clust_compact-ka-1-CompressionInfo.db | Bin 0 -> 83 bytes
..._tables-legacy_ka_clust_compact-ka-1-Data.db | Bin 0 -> 5277 bytes
...les-legacy_ka_clust_compact-ka-1-Digest.sha1 | 1 +
...ables-legacy_ka_clust_compact-ka-1-Filter.db | Bin 0 -> 24 bytes
...tables-legacy_ka_clust_compact-ka-1-Index.db | Bin 0 -> 157685 bytes
...s-legacy_ka_clust_compact-ka-1-Statistics.db | Bin 0 -> 6859 bytes
...bles-legacy_ka_clust_compact-ka-1-Summary.db | Bin 0 -> 83 bytes
..._tables-legacy_ka_clust_compact-ka-1-TOC.txt | 8 +
...lust_counter_compact-ka-1-CompressionInfo.db | Bin 0 -> 75 bytes
...legacy_ka_clust_counter_compact-ka-1-Data.db | Bin 0 -> 4527 bytes
...cy_ka_clust_counter_compact-ka-1-Digest.sha1 | 1 +
...gacy_ka_clust_counter_compact-ka-1-Filter.db | Bin 0 -> 24 bytes
...egacy_ka_clust_counter_compact-ka-1-Index.db | Bin 0 -> 157685 bytes
..._ka_clust_counter_compact-ka-1-Statistics.db | Bin 0 -> 6859 bytes
...acy_ka_clust_counter_compact-ka-1-Summary.db | Bin 0 -> 83 bytes
...legacy_ka_clust_counter_compact-ka-1-TOC.txt | 8 +
...cy_ka_simple_compact-ka-1-CompressionInfo.db | Bin 0 -> 43 bytes
...tables-legacy_ka_simple_compact-ka-1-Data.db | Bin 0 -> 105 bytes
...es-legacy_ka_simple_compact-ka-1-Digest.sha1 | 1 +
...bles-legacy_ka_simple_compact-ka-1-Filter.db | Bin 0 -> 24 bytes
...ables-legacy_ka_simple_compact-ka-1-Index.db | Bin 0 -> 75 bytes
...-legacy_ka_simple_compact-ka-1-Statistics.db | Bin 0 -> 4453 bytes
...les-legacy_ka_simple_compact-ka-1-Summary.db | Bin 0 -> 83 bytes
...tables-legacy_ka_simple_compact-ka-1-TOC.txt | 8 +
...mple_counter_compact-ka-1-CompressionInfo.db | Bin 0 -> 43 bytes
...egacy_ka_simple_counter_compact-ka-1-Data.db | Bin 0 -> 124 bytes
...y_ka_simple_counter_compact-ka-1-Digest.sha1 | 1 +
...acy_ka_simple_counter_compact-ka-1-Filter.db | Bin 0 -> 24 bytes
...gacy_ka_simple_counter_compact-ka-1-Index.db | Bin 0 -> 75 bytes
...ka_simple_counter_compact-ka-1-Statistics.db | Bin 0 -> 4453 bytes
...cy_ka_simple_counter_compact-ka-1-Summary.db | Bin 0 -> 83 bytes
...egacy_ka_simple_counter_compact-ka-1-TOC.txt | 8 +
.../la-1-big-CompressionInfo.db | Bin 0 -> 83 bytes
.../legacy_la_clust_compact/la-1-big-Data.db | Bin 0 -> 5286 bytes
.../la-1-big-Digest.adler32 | 1 +
.../legacy_la_clust_compact/la-1-big-Filter.db | Bin 0 -> 24 bytes
.../legacy_la_clust_compact/la-1-big-Index.db | Bin 0 -> 157685 bytes
.../la-1-big-Statistics.db | Bin 0 -> 6859 bytes
.../legacy_la_clust_compact/la-1-big-Summary.db | Bin 0 -> 75 bytes
.../legacy_la_clust_compact/la-1-big-TOC.txt | 8 +
.../la-1-big-CompressionInfo.db | Bin 0 -> 75 bytes
.../la-1-big-Data.db | Bin 0 -> 4527 bytes
.../la-1-big-Digest.adler32 | 1 +
.../la-1-big-Filter.db | Bin 0 -> 24 bytes
.../la-1-big-Index.db | Bin 0 -> 157685 bytes
.../la-1-big-Statistics.db | Bin 0 -> 6859 bytes
.../la-1-big-Summary.db | Bin 0 -> 75 bytes
.../la-1-big-TOC.txt | 8 +
.../la-1-big-CompressionInfo.db | Bin 0 -> 43 bytes
.../legacy_la_simple_compact/la-1-big-Data.db | Bin 0 -> 106 bytes
.../la-1-big-Digest.adler32 | 1 +
.../legacy_la_simple_compact/la-1-big-Filter.db | Bin 0 -> 24 bytes
.../legacy_la_simple_compact/la-1-big-Index.db | Bin 0 -> 75 bytes
.../la-1-big-Statistics.db | Bin 0 -> 4453 bytes
.../la-1-big-Summary.db | Bin 0 -> 75 bytes
.../legacy_la_simple_compact/la-1-big-TOC.txt | 8 +
.../la-1-big-CompressionInfo.db | Bin 0 -> 43 bytes
.../la-1-big-Data.db | Bin 0 -> 124 bytes
.../la-1-big-Digest.adler32 | 1 +
.../la-1-big-Filter.db | Bin 0 -> 24 bytes
.../la-1-big-Index.db | Bin 0 -> 75 bytes
.../la-1-big-Statistics.db | Bin 0 -> 4453 bytes
.../la-1-big-Summary.db | Bin 0 -> 75 bytes
.../la-1-big-TOC.txt | 8 +
.../ma-1-big-CompressionInfo.db | Bin 0 -> 83 bytes
.../legacy_ma_clust_compact/ma-1-big-Data.db | Bin 0 -> 5393 bytes
.../ma-1-big-Digest.crc32 | 1 +
.../legacy_ma_clust_compact/ma-1-big-Filter.db | Bin 0 -> 24 bytes
.../legacy_ma_clust_compact/ma-1-big-Index.db | Bin 0 -> 157553 bytes
.../ma-1-big-Statistics.db | Bin 0 -> 7046 bytes
.../legacy_ma_clust_compact/ma-1-big-Summary.db | Bin 0 -> 47 bytes
.../legacy_ma_clust_compact/ma-1-big-TOC.txt | 8 +
.../ma-1-big-CompressionInfo.db | Bin 0 -> 75 bytes
.../ma-1-big-Data.db | Bin 0 -> 4606 bytes
.../ma-1-big-Digest.crc32 | 1 +
.../ma-1-big-Filter.db | Bin 0 -> 24 bytes
.../ma-1-big-Index.db | Bin 0 -> 157553 bytes
.../ma-1-big-Statistics.db | Bin 0 -> 7055 bytes
.../ma-1-big-Summary.db | Bin 0 -> 47 bytes
.../ma-1-big-TOC.txt | 8 +
.../ma-1-big-CompressionInfo.db | Bin 0 -> 43 bytes
.../legacy_ma_simple_compact/ma-1-big-Data.db | Bin 0 -> 91 bytes
.../ma-1-big-Digest.crc32 | 1 +
.../legacy_ma_simple_compact/ma-1-big-Filter.db | Bin 0 -> 24 bytes
.../legacy_ma_simple_compact/ma-1-big-Index.db | Bin 0 -> 26 bytes
.../ma-1-big-Statistics.db | Bin 0 -> 4640 bytes
.../ma-1-big-Summary.db | Bin 0 -> 47 bytes
.../legacy_ma_simple_compact/ma-1-big-TOC.txt | 8 +
.../ma-1-big-CompressionInfo.db | Bin 0 -> 43 bytes
.../ma-1-big-Data.db | Bin 0 -> 114 bytes
.../ma-1-big-Digest.crc32 | 1 +
.../ma-1-big-Filter.db | Bin 0 -> 24 bytes
.../ma-1-big-Index.db | Bin 0 -> 27 bytes
.../ma-1-big-Statistics.db | Bin 0 -> 4649 bytes
.../ma-1-big-Summary.db | Bin 0 -> 47 bytes
.../ma-1-big-TOC.txt | 8 +
.../cassandra/AbstractSerializationsTester.java | 1 -
.../apache/cassandra/db/DirectoriesTest.java | 98 ++--
.../cassandra/gms/SerializationsTest.java | 1 -
.../CompressedRandomAccessReaderTest.java | 6 +-
.../CompressedSequentialWriterTest.java | 4 +-
.../cassandra/io/sstable/LegacySSTableTest.java | 369 ++++++------
.../io/util/BufferedRandomAccessFileTest.java | 4 +-
.../io/util/RandomAccessReaderTest.java | 2 +-
.../util/RewindableDataInputStreamPlusTest.java | 539 ++++++++++++++++++
.../cassandra/utils/BytesReadTrackerTest.java | 104 +++-
167 files changed, 2115 insertions(+), 550 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68e6a833/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 149b1d1,53dd292..a5819e6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,6 +1,23 @@@
+3.6
+ * Stress should exit with non-zero status after failure (CASSANDRA-10340)
+ * Add client to cqlsh SHOW_SESSION (CASSANDRA-8958)
+ * Fix nodetool tablestats keyspace level metrics (CASSANDRA-11226)
+ * Store repair options in parent_repair_history (CASSANDRA-11244)
+ * Print current leveling in sstableofflinerelevel (CASSANDRA-9588)
+ * Change repair message for keyspaces with RF 1 (CASSANDRA-11203)
+ * Remove hard-coded SSL cipher suites and protocols (CASSANDRA-10508)
+ * Improve concurrency in CompactionStrategyManager (CASSANDRA-10099)
+ * (cqlsh) interpret CQL type for formatting blobs (CASSANDRA-11274)
+ * Refuse to start and print txn log information in case of disk
+ corruption (CASSANDRA-10112)
+ * Resolve some eclipse-warnings (CASSANDRA-11086)
+ * (cqlsh) Show static columns in a different color (CASSANDRA-11059)
+ * Allow to remove TTLs on table with default_time_to_live (CASSANDRA-11207)
+
+
3.5
Merged from 3.0:
+ * Support streaming pre-3.0 sstables (CASSANDRA-10990)
* Add backpressure to compressed or encrypted commit log (CASSANDRA-10971)
* SSTableExport supports secondary index tables (CASSANDRA-11330)
* Fix sstabledump to include missing info in debug output (CASSANDRA-11321)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68e6a833/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 12a5f62,fbfb7ee..a2102f4
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -589,13 -588,10 +589,15 @@@ public class ColumnFamilyStore implemen
// clear ephemeral snapshots that were not properly cleared last session (CASSANDRA-7357)
clearEphemeralSnapshots(directories);
+ directories.removeTemporaryDirectories();
+
logger.trace("Removing temporary or obsoleted files from unfinished operations for table {}", metadata.cfName);
- LifecycleTransaction.removeUnfinishedLeftovers(metadata);
+ if (!LifecycleTransaction.removeUnfinishedLeftovers(metadata))
+ throw new StartupException(StartupException.ERR_WRONG_DISK_STATE,
+ String.format("Cannot remove temporary or obsoleted files for %s.%s due to a problem with transaction " +
+ "log files. Please check records with problems in the log messages above and fix them. " +
+ "Refer to the 3.0 upgrading instructions in NEWS.txt " +
+ "for a description of transaction log files.", metadata.ksName, metadata.cfName));
logger.trace("Further extra check for orphan sstable files for {}", metadata.cfName);
for (Map.Entry<Descriptor,Set<Component>> sstableFiles : directories.sstableLister(Directories.OnTxnErr.IGNORE).list().entrySet())