From 05a8ce009cfeb7041c5e2035f44a1c0702ead805 Mon Sep 17 00:00:00 2001
From: Francisco Bento da Silva Neto <francisco.bento.silva.neto@ericsson.com>
Date: Thu, 29 Apr 2021 14:58:32 -0300
Subject: [PATCH] JAVA-2938: OverloadedException message is misleading

---
 changelog/README.md                                           | 4 ++++
 .../oss/driver/api/core/servererrors/OverloadedException.java | 4 ++--
 .../datastax/oss/driver/internal/core/cql/Conversions.java    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/changelog/README.md b/changelog/README.md
index 503c5e4f5f2..5e3c2819a51 100644
--- a/changelog/README.md
+++ b/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
diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/OverloadedException.java b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/OverloadedException.java
index 4b7b4bb6d9a..9340976aeb3 100644
--- a/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/OverloadedException.java
+++ b/core/src/main/java/com/datastax/oss/driver/api/core/servererrors/OverloadedException.java
@@ -34,8 +34,8 @@
  */
 public class OverloadedException extends QueryExecutionException {
 
-  public OverloadedException(@NonNull Node coordinator) {
-    super(coordinator, String.format("%s is bootstrapping", 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(
diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/Conversions.java b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/Conversions.java
index 242bf673a7a..1031ca01bd2 100644
--- a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/Conversions.java
+++ b/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: