From 6002d2f48c74a461bc4a93fb9f51fab91da2bb82 Mon Sep 17 00:00:00 2001 From: Luca Milanesio Date: Tue, 25 Apr 2017 10:51:30 +0200 Subject: [PATCH] Increase change screen refresh to 5 mins Increase default setting of change.updateDelay to facilitate new Gerrit setups of novice users to scale up even with limited resources availability. The old value (30 seconds) was too small and caused problems of server overloaded by REST API calls. Change-Id: I68f8adfbb887e7f300e6c53b791570e4b22a5458 --- Documentation/config-gerrit.txt | 2 +- .../com/google/gerrit/acceptance/rest/config/ServerInfoIT.java | 2 +- .../java/com/google/gerrit/server/config/GetServerInfo.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt index 139284ce3a..1e87c5ba21 100644 --- a/Documentation/config-gerrit.txt +++ b/Documentation/config-gerrit.txt @@ -998,7 +998,7 @@ requests per second and requires ~10% CPU. + If 0 the update polling is disabled. + -Default is 30 seconds. +Default is 5 minutes. [[change.allowBlame]]change.allowBlame:: + diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/config/ServerInfoIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/config/ServerInfoIT.java index f51bbf5f9a..351623abfc 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/config/ServerInfoIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/config/ServerInfoIT.java @@ -168,7 +168,7 @@ public class ServerInfoIT extends AbstractDaemonTest { assertThat(i.change.largeChange).isEqualTo(500); assertThat(i.change.replyTooltip).startsWith("Reply and score"); assertThat(i.change.replyLabel).isEqualTo("Reply\u2026"); - assertThat(i.change.updateDelay).isEqualTo(30); + assertThat(i.change.updateDelay).isEqualTo(300); // download assertThat(i.download.archives).containsExactly("tar", "tbz2", "tgz", "txz"); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GetServerInfo.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/GetServerInfo.java index 5c09055ef7..7450b32086 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/GetServerInfo.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/GetServerInfo.java @@ -216,7 +216,7 @@ public class GetServerInfo implements RestReadView { info.replyLabel = Optional.ofNullable(cfg.getString("change", null, "replyLabel")).orElse("Reply") + "\u2026"; info.updateDelay = - (int) ConfigUtil.getTimeUnit(cfg, "change", null, "updateDelay", 30, TimeUnit.SECONDS); + (int) ConfigUtil.getTimeUnit(cfg, "change", null, "updateDelay", 300, TimeUnit.SECONDS); info.submitWholeTopic = Submit.wholeTopicEnabled(cfg); return info; }