| commit | a13d403fb1411b6f32d2407feebdac0d76820c5b | [log] [tgz] |
|---|---|---|
| author | Youssef Elghareeb <ghareeb@google.com> | Mon Apr 11 16:17:06 2022 +0200 |
| committer | Youssef Elghareeb <ghareeb@google.com> | Tue Apr 12 13:15:29 2022 +0200 |
| tree | fa4629fcddd7fa6ebfdbb92113827559f03f906c | |
| parent | c2e94066cf35c9ed33fe694ef8b14ab984752896 [diff] |
Don't update the cache-automerge ref while requesting diffs In change I430ac9bf30, we made the computation of the auto-merge commit synchronous on change/PS creation. The computation creates the auto-merge and updates the cache-automerge ref. The redesigned diff cache requires both old/new commits to be present in the repository (see I817df9061 for context). For this we updated BaseCommitUtil (class that computes the base commit before requesting diffs from the cache) to always compute and persist the auto-merge commit and also update the cache-automerge ref. We've seen occasionnal errors while performing git push due to a lock failure on the cache auto-merge ref. This is due to two sets of callers trying to update this ref: * The change / PS creation path * A simultaneous diff request To fix this, we update BaseCommitUtil and drop the ref update, but the auto-merge commit is still computed. This means the auto-merge will be computed each time a diff is requested, but this shouldn't happen since the other path (PS / change creation) will trigger the ref update. Google-Bug-Id: b/204154755 Release-Notes: skip Change-Id: Ieafe0feeba932b5f35096d4b5de19373658129aa
Gerrit is a code review and project management tool for Git based projects.
Gerrit makes reviews easier by showing changes in a side-by-side display, and allowing inline comments to be added by any reviewer.
Gerrit simplifies Git based project maintainership by permitting any authorized user to submit changes to the master Git repository, rather than requiring all approved changes to be merged in by hand by the project maintainer.
For information about how to install and use Gerrit, refer to the documentation.
Our canonical Git repository is located on googlesource.com. There is a mirror of the repository on Github.
Please report bugs on the issue tracker.
Gerrit is the work of hundreds of contributors. We appreciate your help!
Please read the contribution guidelines.
Note that we do not accept Pull Requests via the Github mirror.
The Developer Mailing list is repo-discuss on Google Groups.
Gerrit is provided under the Apache License 2.0.
Install Bazel and run the following:
git clone --recurse-submodules https://gerrit.googlesource.com/gerrit
cd gerrit && bazel build release
The instruction how to configure GerritForge/BinTray repositories is here
On Debian/Ubuntu run:
apt-get update & apt-get install gerrit=<version>-<release>
NOTE: release is a counter that starts with 1 and indicates the number of packages that have been released with the same version of the software.
On CentOS/RedHat run:
yum clean all && yum install gerrit-<version>[-<release>]
On Fedora run:
dnf clean all && dnf install gerrit-<version>[-<release>]
Docker images of Gerrit are available on DockerHub
To run a CentOS 8 based Gerrit image:
docker run -p 8080:8080 gerritcodereview/gerrit[:version]-centos8
To run a Ubuntu 20.04 based Gerrit image:
docker run -p 8080:8080 gerritcodereview/gerrit[:version]-ubuntu20
NOTE: release is optional. Last released package of the version is installed if the release number is omitted.