commit 6c1d8ab2582ca31791b6d76c051a297132034481
author David Pursehouse <dpursehouse@collab.net> Thu Feb 06 23:29:27 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 06 23:29:27 2020 +0000
tree 2cb292206b4dd0a770f61d737c6ab141f23ebcba
parent 660f3538ae30b73ce319f208839960778b4f6d74
parent e02bb27bee6517ccbc12b9cb03d117c6f56f5c21

Merge "RetryHelper: Include cause in auto-retry logs"

java/com/google/gerrit/server/update/RetryHelper.java

diff --git a/java/com/google/gerrit/server/update/RetryHelper.java b/java/com/google/gerrit/server/update/RetryHelper.java
index e13cab1..2db625b 100644
--- a/java/com/google/gerrit/server/update/RetryHelper.java
+++ b/java/com/google/gerrit/server/update/RetryHelper.java
@@ -482,7 +482,8 @@
                     String traceId = "retry-on-failure-" + new RequestId();
                     traceContext.addTag(RequestId.Type.TRACE_ID, traceId).forceLogging();
                     logger.atFine().withCause(t).log(
-                        "AutoRetry: %s failed, retry with tracing enabled", actionName);
+                        "AutoRetry: %s failed, retry with tracing enabled (cause = %s)",
+                        actionName, cause);
                     opts.onAutoTrace().ifPresent(c -> c.accept(traceId));
                     metrics.autoRetryCount.increment(actionType, actionName, cause);
                     return true;
@@ -492,7 +493,7 @@
                   // enabled and it failed again. Log the failure so that admin can see if it
                   // differs from the failure that triggered the retry.
                   logger.atFine().withCause(t).log(
-                      "AutoRetry: auto-retry of %s has failed", actionName);
+                      "AutoRetry: auto-retry of %s has failed (cause = %s)", actionName, cause);
                   metrics.failuresOnAutoRetryCount.increment(actionType, actionName, cause);
                   return false;
                 }