cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [4/6] cassandra git commit: merge from 2.0
Date Tue, 12 May 2015 15:57:07 GMT
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 <jbellis@apache.org>
Authored: Tue May 12 10:56:43 2015 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
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());


Mime
View raw message