commit 7f0127a3bda49faf8a4c406f2076eb9a245cd4d9
author Dave Borowitz <dborowitz@google.com> Mon Sep 10 21:25:49 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 10 21:25:49 2018 +0000
tree 0a12172ef7ba9cd5aa2665b314f29300f906ab8f
parent dfeb4a850924746c380e872cc334c9b5198f9d9c
parent 310956e1ae3692622a3cb21f5ba676b4e78d2e85

Merge "Add debug log that shows up in trace when an operation is retried"

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 132c04b..10e3455 100644
--- a/java/com/google/gerrit/server/update/RetryHelper.java
+++ b/java/com/google/gerrit/server/update/RetryHelper.java
@@ -31,6 +31,7 @@
 import com.google.common.base.Predicate;
 import com.google.common.base.Throwables;
 import com.google.common.collect.Maps;
+import com.google.common.flogger.FluentLogger;
 import com.google.gerrit.common.Nullable;
 import com.google.gerrit.extensions.restapi.RestApiException;
 import com.google.gerrit.metrics.Counter1;
@@ -52,6 +53,8 @@
 
 @Singleton
 public class RetryHelper {
+  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
+
   @FunctionalInterface
   public interface ChangeAction<T> {
     T call(BatchUpdate.Factory batchUpdateFactory) throws Exception;
@@ -277,6 +280,9 @@
       retryerBuilder.withRetryListener(listener);
       return executeWithTimeoutCount(actionType, action, retryerBuilder.build());
     } finally {
+      if (listener.getAttemptCount() > 1) {
+        logger.atFine().log("%s was attempted %d times", actionType, listener.getAttemptCount());
+      }
       metrics.attemptCounts.record(actionType, listener.getAttemptCount());
     }
   }