From cb2dc3d2aa4d59fa6319a1b9bbb78e98141d26e6 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 12 Feb 2020 10:43:24 +0900 Subject: [PATCH 1/4] Upgrade JGit to v5.6.0.201912101111-r-46-g44ad668d9 Includes the following commits: 003e4cfc2 - Prepare 5.3.8-SNAPSHOT builds 0c3b42509 - JGit v5.3.7.202002110540-r 425e2607f - Prepare 5.1.14-SNAPSHOT builds e0abe9e2a - JGit v5.1.13.202002110435-r 79266a1fe - reftable: don't check deadline on the first try 936a031ca - reftable: clarify comment 8c9f7656c - reftable: clear cache on full compaction dd203f03c - reftable: remove outdated comment 0bf256443 - reftable: clarify that LogCursor may return a null ReflogEntry 75a80c5d3 - Restore behavior of CloneCommand There are no commits that we specifically need; this is just to keep up-to-date with the latest head of upstream's stable-5.6. Change-Id: I49bfe74a67e8b7766c206a7b02fd4520c122deb5 --- modules/jgit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/jgit b/modules/jgit index 3d59d1b80c..44ad668d93 160000 --- a/modules/jgit +++ b/modules/jgit @@ -1 +1 @@ -Subproject commit 3d59d1b80cd90bf22a43e522d372d72f0c2ee8a6 +Subproject commit 44ad668d93ff412fd9d21d84ea91d6bd8a67feb4 From 936ed535a11dfd4d2b4e2a72dd0c8401f8e70a3d Mon Sep 17 00:00:00 2001 From: Eryk Szymanski Date: Mon, 13 Jan 2020 09:38:55 +0100 Subject: [PATCH 2/4] VersionedMetaData: Add debug log when saving metadata Change-Id: I4ad514018bc54c99c48e6e9b6f2000ed61313f49 --- java/com/google/gerrit/server/git/meta/VersionedMetaData.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/java/com/google/gerrit/server/git/meta/VersionedMetaData.java b/java/com/google/gerrit/server/git/meta/VersionedMetaData.java index a228b89e22..97d16b2f93 100644 --- a/java/com/google/gerrit/server/git/meta/VersionedMetaData.java +++ b/java/com/google/gerrit/server/git/meta/VersionedMetaData.java @@ -17,6 +17,7 @@ package com.google.gerrit.server.git.meta; import static com.google.common.base.Preconditions.checkArgument; import com.google.common.base.MoreObjects; +import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.Nullable; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.git.LockFailureException; @@ -67,6 +68,8 @@ import org.eclipse.jgit.util.RawParseUtils; * read from the repository, or format an update that can later be written back to the repository. */ public abstract class VersionedMetaData { + private static final FluentLogger logger = FluentLogger.forEnclosingClass(); + /** * Path information that does not hold references to any repository data structures, allowing the * application to retain this object for long periods of time. @@ -406,6 +409,7 @@ public abstract class VersionedMetaData { // read the subject line and use it as reflog message ru.setRefLogMessage("commit: " + reader.readLine(), true); } + logger.atFine().log("Saving commit: " + message); inserter.flush(); RefUpdate.Result result = ru.update(); switch (result) { From 3005e188c8f67990699363c4b70f9897989366c5 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 30 Jan 2020 13:36:26 +0900 Subject: [PATCH 3/4] ProjectCacheImpl: Don't log cause when project is not found This occurs very frequently and the cause is always the same, so logging with the stack trace spams the logs making it difficult to find stack traces that are caused by real issues. Change-Id: I6acc32937ee647337337f99309947b0d414dffad Signed-off-by: David Pursehouse --- java/com/google/gerrit/server/project/ProjectCacheImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/com/google/gerrit/server/project/ProjectCacheImpl.java b/java/com/google/gerrit/server/project/ProjectCacheImpl.java index 8ddeea3348..d2ca7a48cc 100644 --- a/java/com/google/gerrit/server/project/ProjectCacheImpl.java +++ b/java/com/google/gerrit/server/project/ProjectCacheImpl.java @@ -154,7 +154,7 @@ public class ProjectCacheImpl implements ProjectCache { } throw new IOException(e); } - logger.atFine().withCause(e).log("Cannot find project %s", projectName.get()); + logger.atFine().log("Cannot find project %s", projectName.get()); return null; } } From f3c406ce6f6872a4dbbf6d603e7d25f8d24d689d Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 12 Feb 2020 13:46:35 +0100 Subject: [PATCH 4/4] Fix Gerrit version given in linux quickstart guide Change-Id: Ib019178cfecb22dc20385845b94aec8b6d46b9d2 --- Documentation/linux-quickstart.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/linux-quickstart.txt b/Documentation/linux-quickstart.txt index 0d8848e5f0..643bde0570 100644 --- a/Documentation/linux-quickstart.txt +++ b/Documentation/linux-quickstart.txt @@ -29,10 +29,10 @@ From the Linux machine on which you want to install Gerrit: . Download the desired Gerrit archive. To view previous archives, see -link:https://gerrit-releases.storage.googleapis.com/index.html[Gerrit Code Review: Releases]. The steps below install Gerrit 3.0.3: +link:https://gerrit-releases.storage.googleapis.com/index.html[Gerrit Code Review: Releases]. The steps below install Gerrit 3.1.3: .... -wget https://gerrit-releases.storage.googleapis.com/gerrit-3.0.3.war +wget https://gerrit-releases.storage.googleapis.com/gerrit-3.1.3.war .... NOTE: To build and install Gerrit from the source files, see