JAVA-2938: OverloadedException message is misleading

Author: chicobento

changelog/README.md

@@ -2,6 +2,10 @@
 
 <!-- Note: contrary to 3.x, insert new entries *first* in their section -->
 
+### 4.11.2 (in progress)
+
+- [bug] JAVA-2938: OverloadedException message is misleading
+
 ### 4.11.1
 
 - [bug] JAVA-2910: Add a configuration option to support strong values for prepared statements cache

core/src/main/java/com/datastax/oss/driver/api/core/servererrors/OverloadedException.java

@@ -27,15 +27,19 @@
 /**
  * Thrown when the coordinator reported itself as being overloaded.
  *
- * <p>This exception is processed by {@link RetryPolicy#onErrorResponse(Request,
+ * <p>This exception is processed by {@link RetryPolicy#onErrorResponseVerdict(Request,
  * CoordinatorException, int)}, which will decide if it is rethrown directly to the client or if the
  * request should be retried. If all other tried nodes also fail, this exception will appear in the
  * {@link AllNodesFailedException} thrown to the client.
  */
 public class OverloadedException extends QueryExecutionException {
 
   public OverloadedException(@NonNull Node coordinator) {
-    super(coordinator, String.format("%s is bootstrapping", coordinator), null, false);
+    super(coordinator, String.format("%s is overloaded", coordinator), null, false);
+  }
+
+  public OverloadedException(@NonNull Node coordinator, @NonNull String message) {
+    super(coordinator, String.format("%s is overloaded: %s", coordinator, message), null, false);
   }
 
   private OverloadedException(

core/src/main/java/com/datastax/oss/driver/internal/core/cql/Conversions.java

@@ -462,7 +462,7 @@ public static CoordinatorException toThrowable(
             unavailable.required,
             unavailable.alive);
       case ProtocolConstants.ErrorCode.OVERLOADED:
-        return new OverloadedException(node);
+        return new OverloadedException(node, errorMessage.message);
       case ProtocolConstants.ErrorCode.IS_BOOTSTRAPPING:
         return new BootstrappingException(node);
       case ProtocolConstants.ErrorCode.TRUNCATE_ERROR: