Merge branch 'cassandra-3.11' into trunk

CHANGES.txt

@@ -63,6 +63,7 @@
  * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983)
  * Address message coalescing regression (CASSANDRA-12676)
 Merged from 3.0:
+ * Fix code to not exchange schema across major versions (CASSANDRA-13274)
  * Dropping column results in "corrupt" SSTable (CASSANDRA-13337)
  * Bugs handling range tombstones in the sstable iterators (CASSANDRA-13340)
  * Fix CONTAINS filtering for null collections (CASSANDRA-13246)

NEWS.txt

@@ -34,6 +34,8 @@ Upgrading
       a 3.0.x/3.x version first (and run upgradesstable). In particular, this
       mean Cassandra 4.0 cannot load or read pre-3.0 sstables in any way: you
       will need to upgrade those sstable in 3.0.x/3.x first.
+    - Upgrades from 3.0.x or 3.x are supported since 3.0.13 or 3.11.0, previous
+      versions will causes issues during rolling upgrades (CASSANDRA-13274).
     - Cassandra will no longer allow invalid keyspace replication options, such
       as invalid datacenter names for NetworkTopologyStrategy. Operators MUST
       add new nodes to a datacenter before they can set set ALTER or CREATE

src/java/org/apache/cassandra/net/MessagingService.java

@@ -1122,8 +1122,6 @@ public final class MessagingService implements MessagingServiceMBean
      */
     public int setVersion(InetAddress endpoint, int version)
     {
-        // We can't talk to someone from the future
-        version = Math.min(version, current_version);
         logger.trace("Setting version {} for {}", version, endpoint);
 
         Integer v = versions.put(endpoint, version);
@@ -1136,6 +1134,10 @@ public final class MessagingService implements MessagingServiceMBean
         versions.remove(endpoint);
     }
 
+    /**
+     * Returns the messaging-version as announced by the given node but capped
+     * to the min of the version as announced by the node and {@link #current_version}.
+     */
     public int getVersion(InetAddress endpoint)
     {
         Integer v = versions.get(endpoint);
@@ -1154,6 +1156,9 @@ public final class MessagingService implements MessagingServiceMBean
         return getVersion(InetAddress.getByName(endpoint));
     }
 
+    /**
+     * Returns the messaging-version exactly as announced by the given endpoint.
+     */
     public int getRawVersion(InetAddress endpoint)
     {
         Integer v = versions.get(endpoint);