Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 88CFD17EBD for ; Tue, 12 May 2015 15:57:05 +0000 (UTC) Received: (qmail 98900 invoked by uid 500); 12 May 2015 15:57:05 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 98819 invoked by uid 500); 12 May 2015 15:57:05 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 98638 invoked by uid 99); 12 May 2015 15:57:05 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 May 2015 15:57:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BB0AFE0B3F; Tue, 12 May 2015 15:57:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Tue, 12 May 2015 15:57:07 -0000 Message-Id: <51050bfa2b4c46e0a6d45ec8e4712207@git.apache.org> In-Reply-To: <53cb9296d7504b7997994c2cba30bd01@git.apache.org> References: <53cb9296d7504b7997994c2cba30bd01@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/6] cassandra git commit: merge from 2.0 merge from 2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2e7b0884 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e7b0884 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e7b0884 Branch: refs/heads/trunk Commit: 2e7b0884a2d2324642eca99707a3f25fef77362f Parents: ed0026f a7cae32 Author: Jonathan Ellis Authored: Tue May 12 10:56:43 2015 -0500 Committer: Jonathan Ellis Committed: Tue May 12 10:56:43 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/locator/ReconnectableSnitchHelper.java | 1 - .../apache/cassandra/net/IncomingTcpConnection.java | 14 ++++---------- 3 files changed, 5 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e7b0884/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 6e586a3,685b945..aa5f235 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,24 -1,5 +1,25 @@@ -2.0.15: +2.1.6 + * Fix commitlog getCompletedTasks to not increment (CASSANDRA-9339) + * Fix for harmless exceptions logged as ERROR (CASSANDRA-8564) + * Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606) + * Improve sstable exclusion from partition tombstones (CASSANDRA-9298) + * Validate the indexed column rather than the cell's contents for 2i (CASSANDRA-9057) + * Add support for top-k custom 2i queries (CASSANDRA-8717) + * Fix error when dropping table during compaction (CASSANDRA-9251) + * cassandra-stress supports validation operations over user profiles (CASSANDRA-8773) + * Add support for rate limiting log messages (CASSANDRA-9029) + * Log the partition key with tombstone warnings (CASSANDRA-8561) + * Reduce runWithCompactionsDisabled poll interval to 1ms (CASSANDRA-9271) + * Fix PITR commitlog replay (CASSANDRA-9195) + * GCInspector logs very different times (CASSANDRA-9124) + * Fix deleting from an empty list (CASSANDRA-9198) + * Update tuple and collection types that use a user-defined type when that UDT + is modified (CASSANDRA-9148, CASSANDRA-9192) + * Use higher timeout for prepair and snapshot in repair (CASSANDRA-9261) + * Fix anticompaction blocking ANTI_ENTROPY stage (CASSANDRA-9151) + * Repair waits for anticompaction to finish (CASSANDRA-9097) +Merged from 2.0: + * Fix ReconnectableSnitch reconnecting to peers during upgrade (CASSANDRA-6702) * Include keyspace and table name in error log for collections over the size limit (CASSANDRA-9286) * Avoid potential overlap in LCS with single-partition sstables (CASSANDRA-9322) http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e7b0884/src/java/org/apache/cassandra/net/IncomingTcpConnection.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/net/IncomingTcpConnection.java index 08baf89,4817c75..2456050 --- a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java +++ b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java @@@ -158,18 -139,9 +161,9 @@@ public class IncomingTcpConnection exte } else { - in = new DataInputStream(new BufferedInputStream(socket.getInputStream(), 4096)); + in = new DataInputStream(new BufferedInputStream(socket.getInputStream(), BUFFER_SIZE)); } - if (version > MessagingService.current_version) - { - // save the endpoint so gossip will reconnect to it - Gossiper.instance.addSavedEndpoint(from); - logger.info("Received messages from newer protocol version {}. Ignoring", version); - return; - } - // outbound side will reconnect if necessary to upgrade version - while (true) { MessagingService.validateMagic(in.readInt());