Add attempted addresses to RetriesFailedException

MnO2 · Nov 16, 2019 · d6a6da5 · d6a6da5
1 parent 4b5830e
commit d6a6da5
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/drift-client/src/main/java/com/facebook/drift/client/DriftMethodInvocation.java b/drift-client/src/main/java/com/facebook/drift/client/DriftMethodInvocation.java
@@ -330,7 +330,8 @@ private synchronized void fail(String reason)
                 invocationAttempts,
                 succinctNanos(ticker.read() - startTime),
                 failedConnections,
-                overloadedRejects);
+                overloadedRejects,
+                attemptedAddresses);
 
         // attach message exception to the exception thrown to caller
         if (cause instanceof DriftApplicationException) {

diff --git a/drift-client/src/main/java/com/facebook/drift/client/RetriesFailedException.java b/drift-client/src/main/java/com/facebook/drift/client/RetriesFailedException.java
@@ -15,8 +15,12 @@
  */
 package com.facebook.drift.client;
 
+import com.facebook.drift.transport.client.Address;
+import com.google.common.collect.ImmutableSet;
 import io.airlift.units.Duration;
 
+import java.util.Set;
+
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
 
@@ -27,20 +31,29 @@ public class RetriesFailedException
     private final int failedConnections;
     private final Duration retryTime;
     private final int overloadedRejects;
+    private final Set<? extends Address> attemptedAddresses;
 
-    public RetriesFailedException(String reason, int invocationAttempts, Duration retryTime, int failedConnections, int overloadedRejects)
+    public RetriesFailedException(
+            String reason,
+            int invocationAttempts,
+            Duration retryTime,
+            int failedConnections,
+            int overloadedRejects,
+            Set<? extends Address> attemptedAddresses)
     {
         super(format(
-                "%s (invocationAttempts: %s, duration: %s, failedConnections: %s, overloadedRejects: %s)",
+                "%s (invocationAttempts: %s, duration: %s, failedConnections: %s, overloadedRejects: %s, attemptedAddresses: %s)",
                 reason,
                 invocationAttempts,
                 retryTime,
                 failedConnections,
-                overloadedRejects));
+                overloadedRejects,
+                attemptedAddresses));
         this.invocationAttempts = invocationAttempts;
         this.failedConnections = failedConnections;
         this.retryTime = requireNonNull(retryTime, "retryTime is null");
         this.overloadedRejects = overloadedRejects;
+        this.attemptedAddresses = ImmutableSet.copyOf(requireNonNull(attemptedAddresses, "attemptedAddresses is null"));
     }
 
     public int getInvocationAttempts()
@@ -62,4 +75,9 @@ public int getOverloadedRejects()
     {
         return overloadedRejects;
     }
+
+    public Set<? extends Address> getAttemptedAddresses()
+    {
+        return attemptedAddresses;
+    }
 }