Merge branch 'cassandra-3.0' into cassandra-3.11

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

Branch: refs/heads/cassandra-3.11
Commit: 0d4aacc832b1ffa428970d5c0e235d54585e22c2
Parents: ab8348c 06b3521
Author: Jason Brown <jasedbr...@gmail.com>
Authored: Thu May 17 10:34:56 2018 -0700
Committer: Jason Brown <jasedbr...@gmail.com>
Committed: Thu May 17 10:35:36 2018 -0700

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../apache/cassandra/net/MessagingService.java  | 14 ++++-
 .../org/apache/cassandra/net/PingMessage.java   | 60 ++++++++++++++++++++
 3 files changed, 72 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d4aacc8/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d70b381,1293bd4..87e7c24
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,5 +1,21 @@@
 -3.0.17
 +3.11.3
 + * Fix New SASI view creation during Index Redistribution (CASSANDRA-14055)
 + * Remove string formatting lines from BufferPool hot path (CASSANDRA-14416)
 + * Update metrics to 3.1.5 (CASSANDRA-12924)
 + * Detect OpenJDK jvm type and architecture (CASSANDRA-12793)
 + * Don't use guava collections in the non-system keyspace jmx attributes 
(CASSANDRA-12271)
 + * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851)
 + * Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299)
 + * Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370)
 + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
 + * Serialize empty buffer as empty string for json output format 
(CASSANDRA-14245)
 + * Allow logging implementation to be interchanged for embedded testing 
(CASSANDRA-13396)
 + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247)
 + * Fix Loss of digits when doing CAST from varint/bigint to decimal 
(CASSANDRA-14170)
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava 
RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
+  * Cleanup StartupClusterConnectivityChecker and PING Verb (CASSANDRA-14447)
   * Fix deprecated repair error notifications from 3.x clusters to legacy JMX 
clients (CASSANDRA-13121)
   * Cassandra not starting when using enhanced startup scripts in windows 
(CASSANDRA-14418)
   * Fix progress stats and units in compactionstats (CASSANDRA-12244)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d4aacc8/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/net/MessagingService.java
index 027e218,047f51f..59ed8f3
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@@ -206,36 -143,18 +206,41 @@@ public final class MessagingService imp
          _TRACE, // dummy verb so we can use MS.droppedMessagesMap
          ECHO,
          REPAIR_MESSAGE,
 -        PAXOS_PREPARE,
 -        PAXOS_PROPOSE,
 -        PAXOS_COMMIT,
 -        @Deprecated PAGED_RANGE,
 +        PAXOS_PREPARE
 +        {
 +            public long getTimeout()
 +            {
 +                return DatabaseDescriptor.getWriteRpcTimeout();
 +            }
 +        },
 +        PAXOS_PROPOSE
 +        {
 +            public long getTimeout()
 +            {
 +                return DatabaseDescriptor.getWriteRpcTimeout();
 +            }
 +        },
 +        PAXOS_COMMIT
 +        {
 +            public long getTimeout()
 +            {
 +                return DatabaseDescriptor.getWriteRpcTimeout();
 +            }
 +        },
 +        @Deprecated PAGED_RANGE
 +        {
 +            public long getTimeout()
 +            {
 +                return DatabaseDescriptor.getRangeRpcTimeout();
 +            }
 +        },
-         // remember to add new verbs at the end, since we serialize by ordinal
-         UNUSED_1,
+         PING,
 -
+         // UNUSED verbs were used as padding for backward/forward 
compatability before 4.0,
+         // but it wasn't quite as bullet/future proof as needed. We still 
need to keep these entries
+         // around, at least for a major rev or two (post-4.0). see 
CASSANDRA-13993 for a discussion.
+         // For now, though, the UNUSED are legacy values (placeholders, 
basically) that should only be used
+         // for correctly adding VERBs that need to be emergency additions to 
3.0/3.11.
+         // We can reclaim them (their id's, to be correct) in future 
versions, if desired, though.
          UNUSED_2,
          UNUSED_3,
          UNUSED_4,


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to