JAVA-2924: Consider protocol version unsupported when server requires USE_BETA flag for it (#1534)

Author: adutra

changelog/README.md

@@ -10,6 +10,7 @@
 - [improvement] JAVA-2705: Remove protocol v5 beta status, add v6-beta.
 - [bug] JAVA-2923: Detect and use Guava's new HostAndPort.getHost method.
 - [bug] JAVA-2922: Switch to modern framing format inside a channel handler.
+- [bug] JAVA-2924: Consider protocol version unsupported when server requires USE_BETA flag for it.
 
 ## 3.10.2
 

driver-core/src/main/java/com/datastax/driver/core/Connection.java

@@ -572,7 +572,9 @@ private boolean isUnsupportedProtocolVersion(Responses.Error error) {
     // Testing for a specific string is a tad fragile but well, we don't have much choice
     // C* 2.1 reports a server error instead of protocol error, see CASSANDRA-9451
     return (error.code == ExceptionCode.PROTOCOL_ERROR || error.code == ExceptionCode.SERVER_ERROR)
-        && error.message.contains("Invalid or unsupported protocol version");
+        && (error.message.contains("Invalid or unsupported protocol version")
+            // JAVA-2924: server is behind driver and considers the proposed version as beta
+            || error.message.contains("Beta version of the protocol used"));
   }
 
   private UnsupportedProtocolVersionException unsupportedProtocolVersionException(

driver-core/src/test/java/com/datastax/driver/core/ProtocolVersionRenegotiationTest.java

@@ -16,7 +16,7 @@
 package com.datastax.driver.core;
 
 import static com.datastax.driver.core.ProtocolVersion.V1;
-import static com.datastax.driver.core.ProtocolVersion.V4;
+import static com.datastax.driver.core.ProtocolVersion.V5;
 import static com.datastax.driver.core.ProtocolVersion.V6;
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -55,13 +55,14 @@ public void should_fail_when_version_provided_and_too_low_3_8_plus() throws Exce
   /** @jira_ticket JAVA-1367 */
   @Test(groups = "short")
   public void should_fail_when_version_provided_and_too_high() throws Exception {
-    if (ccm().getCassandraVersion().compareTo(VersionNumber.parse("2.2")) >= 0) {
-      throw new SkipException("Server supports protocol V4");
+    if (ccm().getCassandraVersion().compareTo(VersionNumber.parse("3.10")) >= 0) {
+      throw new SkipException("Server supports protocol V5");
     }
-    UnsupportedProtocolVersionException e = connectWithUnsupportedVersion(V4);
-    assertThat(e.getUnsupportedVersion()).isEqualTo(V4);
-    // pre-CASSANDRA-11464: server replies with its own version
-    assertThat(e.getServerVersion()).isEqualTo(protocolVersion);
+    UnsupportedProtocolVersionException e = connectWithUnsupportedVersion(V5);
+    assertThat(e.getUnsupportedVersion()).isEqualTo(V5);
+    // see CASSANDRA-11464: for C* < 3.0.9 and 3.8, server replies with its own version;
+    // otherwise it replies with the client's version.
+    assertThat(e.getServerVersion()).isIn(V5, protocolVersion);
   }
 
   /** @jira_ticket JAVA-1367 */