commit 3890d3a02d9149fbc6423695a49a8aab6b252f3d
author Edwin Kempin <ekempin@google.com> Wed Feb 24 13:06:11 2021 +0100
committer Edwin Kempin <ekempin@google.com> Wed Feb 24 13:06:11 2021 +0100
tree fff329f2ea3502f192b0e6428e56090a50e599aa
parent 517812b2bedf770aee65bd896e89795857b3ad52

Retry the creation of auto-merge commits more persistently

We can see in the logs that the creation of auto-merge commits sometimes
fails due to lock failures, which causes errors in important operations
such as submit.

Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: I60c0f2503c8cca37f3307d42cf2ea3e639381888

java/com/google/gerrit/server/patch/AutoMerger.java

diff --git a/java/com/google/gerrit/server/patch/AutoMerger.java b/java/com/google/gerrit/server/patch/AutoMerger.java
index fe915c5..ac37411 100644
--- a/java/com/google/gerrit/server/patch/AutoMerger.java
+++ b/java/com/google/gerrit/server/patch/AutoMerger.java
@@ -109,6 +109,7 @@
               ActionType.GIT_UPDATE,
               "createAutoMerge",
               () -> createAutoMergeCommit(repo, rw, ins, merge, mergeStrategy))
+          .defaultTimeoutMultiplier(2)
           .call();
     } catch (Exception e) {
       Throwables.throwIfUnchecked(e);