opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-3.1'

Browse Source 
* stable-3.1:
  Fix Gerrit version given in linux quickstart guide
  ProjectCacheImpl: Don't log cause when project is not found
  VersionedMetaData: Add debug log when saving metadata
  Upgrade JGit to v5.6.0.201912101111-r-46-g44ad668d9

Change-Id: I122d62c334ba6c5bdfe5d476948ffa6685fd96b4
This commit is contained in:
David Pursehouse 2020-02-13 10:25:58 +09:00
commit a8f0e07fdc
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/linux-quickstart.txt
View File

@ -30,10 +30,10 @@ From the Linux machine on which you want to install Gerrit:
. Download the desired Gerrit archive. . Download the desired Gerrit archive.
To view previous archives, see To view previous archives, see
link:https://gerrit-releases.storage.googleapis.com/index.html[Gerrit Code Review: Releases,role=external,window=_blank]. The steps below install Gerrit 3.0.3: link:https://gerrit-releases.storage.googleapis.com/index.html[Gerrit Code Review: Releases,role=external,window=_blank]. 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 NOTE: To build and install Gerrit from the source files, see

4
java/com/google/gerrit/server/git/meta/VersionedMetaData.java
View File

@ -17,6 +17,7 @@ package com.google.gerrit.server.git.meta;
import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkArgument;
import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects;
import com.google.common.flogger.FluentLogger;
import com.google.gerrit.common.Nullable; import com.google.gerrit.common.Nullable;
import com.google.gerrit.entities.Project; import com.google.gerrit.entities.Project;
import com.google.gerrit.git.GitUpdateFailureException; import com.google.gerrit.git.GitUpdateFailureException;
@ -70,6 +71,8 @@ import org.eclipse.jgit.util.RawParseUtils;
* read from the repository, or format an update that can later be written back to the repository. * read from the repository, or format an update that can later be written back to the repository.
*/ */
public abstract class VersionedMetaData { 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 * Path information that does not hold references to any repository data structures, allowing the
* application to retain this object for long periods of time. * application to retain this object for long periods of time.
@ -409,6 +412,7 @@ public abstract class VersionedMetaData {
// read the subject line and use it as reflog message // read the subject line and use it as reflog message
ru.setRefLogMessage("commit: " + reader.readLine(), true); ru.setRefLogMessage("commit: " + reader.readLine(), true);
} }
logger.atFine().log("Saving commit: " + message);
inserter.flush(); inserter.flush();
RefUpdate.Result result = ru.update(); RefUpdate.Result result = ru.update();
switch (result) { switch (result) {

2
java/com/google/gerrit/server/project/ProjectCacheImpl.java
View File

@ -168,7 +168,7 @@ public class ProjectCacheImpl implements ProjectCache {
} }
throw new IOException(e); 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; return null;
} }
} }