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/5fdb90e1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fdb90e1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5fdb90e1 Branch: refs/heads/cassandra-3.8 Commit: 5fdb90e12b04fa4209993f609206e6920138d851 Parents: 5cef78a 91f7387 Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Fri Aug 12 18:29:36 2016 -0500 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Fri Aug 12 18:29:36 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 4 +-- .../cassandra/config/DatabaseDescriptor.java | 6 ++-- .../cassandra/locator/Ec2MultiRegionSnitch.java | 6 +++- .../cassandra/service/StorageService.java | 4 +-- .../org/apache/cassandra/transport/Server.java | 2 +- .../org/apache/cassandra/utils/FBUtilities.java | 20 ++++++++++++ .../apache/cassandra/utils/FBUtilitiesTest.java | 32 ++++++++++++++++++++ 8 files changed, 67 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fdb90e1/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index cccb62d,394598a..7ba8370 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,40 -1,5 +1,41 @@@ -2.2.8 +3.0.9 + * Fix clean interval not sent to commit log for empty memtable flush (CASSANDRA-12436) + * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331) + * Backport CASSANDRA-12002 (CASSANDRA-12177) + * Make sure compaction stats are updated when compaction is interrupted (CASSANDRA-12100) + * 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: + * Only set broadcast_rpc_address on Ec2MultiRegionSnitch if it's not set (CASSANDRA-11357) * Update StorageProxy range metrics for timeouts, failures and unavailables (CASSANDRA-9507) * Add Sigar to classes included in clientutil.jar (CASSANDRA-11635) * Add decay to histograms and timers used for metrics (CASSANDRA-11752) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fdb90e1/NEWS.txt ---------------------------------------------------------------------- diff --cc NEWS.txt index 56dd6ea,f0712eb..6b8dfd3 --- a/NEWS.txt +++ b/NEWS.txt @@@ -13,55 -13,7 +13,55 @@@ restore snapshots created with the prev 'sstableloader' tool. You can upgrade the file format of your snapshots using the provided 'sstableupgrade' tool. -2.2.7 +3.0.8 +===== + +Upgrading +--------- - - Nothing specific to this release, but please see previous versions upgrading section, - especially if you are upgrading from 2.2. ++ - Ec2MultiRegionSnitch will no longer automatically set broadcast_rpc_address ++ to the public instance IP if this property is defined on cassandra.yaml. + +3.0.7 +===== + +Upgrading +--------- + - A maximum size for SSTables values has been introduced, to prevent out of memory + exceptions when reading corrupt SSTables. This maximum size can be set via + max_value_size_in_mb in cassandra.yaml. The default is 256MB, which matches the default + value of native_transport_max_frame_size_in_mb. SSTables will be considered corrupt if + they contain values whose size exceeds this limit. See CASSANDRA-9530 for more details. + +Deprecation +----------- + - DateTieredCompactionStrategy has been deprecated - new tables should use + TimeWindowCompactionStrategy. Note that migrating an existing DTCS-table to TWCS might + cause increased compaction load for a while after the migration so make sure you run + tests before migrating. Read CASSANDRA-9666 for background on this. + +New features +------------ + - TimeWindowCompactionStrategy has been added. This has proven to be a better approach + to time series compaction and new tables should use this instead of DTCS. See + CASSANDRA-9666 for details. + +3.0.6 +===== + +New features +------------ + - JSON timestamps are now in UTC and contain the timezone information, see + CASSANDRA-11137 for more details. + +3.0.5 +===== + +Upgrading +--------- + - Nothing specific to this release, but please see previous versions upgrading section, + especially if you are upgrading from 2.2. + +3.0.4 ===== New features http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fdb90e1/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fdb90e1/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fdb90e1/src/java/org/apache/cassandra/transport/Server.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fdb90e1/src/java/org/apache/cassandra/utils/FBUtilities.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/utils/FBUtilities.java index d996c91,23a2c2e..ca2775f --- a/src/java/org/apache/cassandra/utils/FBUtilities.java +++ b/src/java/org/apache/cassandra/utils/FBUtilities.java @@@ -32,7 -34,9 +32,8 @@@ import java.util.zip.Checksum import javax.annotation.Nonnull; import javax.annotation.Nullable; + import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; -import com.google.common.collect.AbstractIterator; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fdb90e1/test/unit/org/apache/cassandra/utils/FBUtilitiesTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/utils/FBUtilitiesTest.java index 90c5f05,5b86252..acd68eb --- a/test/unit/org/apache/cassandra/utils/FBUtilitiesTest.java +++ b/test/unit/org/apache/cassandra/utils/FBUtilitiesTest.java @@@ -18,7 -18,10 +18,8 @@@ package org.apache.cassandra.utils; -import static org.junit.Assert.fail; - import java.io.IOException; + import java.net.InetAddress; import java.nio.ByteBuffer; import java.nio.charset.CharacterCodingException; import java.nio.charset.StandardCharsets; @@@ -29,8 -31,10 +30,11 @@@ import org.junit.Test import java.util.Map; import java.util.TreeMap; + import org.apache.cassandra.config.Config; + import org.apache.cassandra.config.DatabaseDescriptor; + import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; public class FBUtilitiesTest {
