From de482b0f5bfb64591bd1369380e5305eaebf4b56 Mon Sep 17 00:00:00 2001 From: Dariusz Luksza Date: Mon, 9 Nov 2015 18:25:04 +0100 Subject: [PATCH] Increase default value of receive.timeout Double the value of receive.timeout in order to enable default Gerrit configuration receive huge repositories like lge/hammerhead-kernel [1] from Android code base. [1] https://android.googlesource.com/device/lge/hammerhead-kernel/ Change-Id: I30db27c36f03aacea3fd08137dfe4f04020d05de Signed-off-by: Dariusz Luksza --- Documentation/config-gerrit.txt | 2 +- .../java/com/google/gerrit/server/git/AsyncReceiveCommits.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt index e7b7cdc360..923c72d604 100644 --- a/Documentation/config-gerrit.txt +++ b/Documentation/config-gerrit.txt @@ -3031,7 +3031,7 @@ and updating references, not the time to index the pack. Values can be specified using standard time unit abbreviations ('ms', 'sec', 'min', etc.). + -Default is 2 minutes. If no unit is specified, milliseconds +Default is 4 minutes. If no unit is specified, milliseconds is assumed. [[receive.trustedKey]]receive.trustedKey:: diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/AsyncReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/AsyncReceiveCommits.java index 5952568e74..899b06a47f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/AsyncReceiveCommits.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/AsyncReceiveCommits.java @@ -72,7 +72,7 @@ public class AsyncReceiveCommits implements PreReceiveHook { long getTimeoutMillis(@GerritServerConfig final Config cfg) { return ConfigUtil.getTimeUnit( cfg, "receive", null, "timeout", - TimeUnit.MINUTES.toMillis(2), + TimeUnit.MINUTES.toMillis(4), TimeUnit.MILLISECONDS); } }