commit 2546ca24defcf3ae74250d3116db9d354772ec39
author Gal Paikin <paiking@google.com> Wed Feb 24 13:39:57 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 24 13:39:57 2021 +0000
tree df03ba01ceda4f69d340b97e4d23fbd07fbee024
parent f3111deecff73e0589f553e7506adb13ddb4e2c0
parent 3890d3a02d9149fbc6423695a49a8aab6b252f3d

Merge "Retry the creation of auto-merge commits more persistently"

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);