Reload latest SHA1 from local when filtering RemoteRefUpdate

The fix I579f277635 to the Issue 12425 (racy conditions when pushing
refs) has created a situation where refs are pushed even when they
are potentially out of sync.

The problem happened when a local ref was aligned with the global-refdb
but the SHA1 contained in the ref-update event was not, and therefore
the generated RemoteRefUpdate caused a remote ref to be winded back to
one commit.

If the local SHA1 of a ref has changed and is aligned with the
global-refdb then it can be used for push, and the RemoteRefUpdate
needs to be updated with the newer SHA1 for preventing the rewind of
the branch to an earlier point.

This completes the fix originally introduced for sorting out missed
replication events due to racy conditions when checking if the
RemoteRefUpdate is up-to-date with the global-refdb.

Bug: Issue 12425
Change-Id: Ic9bd23694640bd8bfbf875876d1559713cf6c262
2 files changed
tree: 6a67cf404ca44404807cf94f3f2387a104fd59e9
  1. .settings/
  2. e2e-tests/
  3. images/
  4. setup_local_env/
  5. src/
  6. .bazelrc
  7. .gitignore
  8. .mailmap
  9. BUILD
  10. DESIGN.md
  11. docker-compose.kafka-broker.yaml
  12. external_plugin_deps.bzl
  13. Jenkinsfile
  14. LICENSE
  15. README.md
README.md

Gerrit multi-site plugin

This plugin allows to deploy a distributed cluster of multiple Gerrit masters each using a separate site without sharing any storage. The alignment between the masters happens using the replication plugin and an external message broker.

Requirements for the Gerrit masters are:

  • Gerrit v2.16.5 or later
  • Migrated to NoteDb
  • Connected to the same message broker
  • Accessible via a load balancer (e.g. HAProxy)

NOTE: The multi-site plugin will not start if Gerrit is not yet migrated to NoteDb.

Supports multiple read/write masters across multiple sites across different geographic locations. The Gerrit nodes are kept synchronized between each other using the replication plugin and a global ref-database in order to detect and prevent split-brains.

For more details on the overall multi-site design and roadmap, please refer to the multi-site plugin DESIGN.md document

License

This plugin is released under the same Apache 2.0 license and copyright holders as of the Gerrit Code Review project.

How to build

The multi-site plugin can only be built in tree mode, by cloning Gerrit and the multi-site plugin code, and checking them out on the desired branch.

Example of cloning Gerrit and multi-site for a stable-2.16 build:

git clone -b stable-2.16 https://gerrit.googlesource.com/gerrit
git clone -b stable-2.16 https://gerrit.googlesource.com/plugins/multi-site

cd gerrit/plugins
ln -s ../../multi-site .
rm external_plugin_deps.bzl
ln -s multi-site/external_plugin_deps.bzl .

Example of building the multi-site plugin:

cd gerrit
bazel build plugins/multi-site

The multi-site.jar plugin is generated to bazel-bin/plugins/multi-site/multi-site.jar.

Example of testing the multi-site plugin:

cd gerrit
bazel test plugins/multi-site:multi_site_tests

NOTE: The multi-site tests include also the use of Docker containers for instantiating and using a Kafka/Zookeeper broker. Make sure you have a Docker daemon running (/var/run/docker.sock accessible) or a DOCKER_HOST pointing to a Docker server.

How to configure

Install the multi-site plugin into the $GERRIT_SITE/lib directory of all the Gerrit servers that are part of the multi-site cluster. Create a symbolic link from $GERRIT_SITE/lib/multi-site.jar into the $GERRIT_SITE/plugins.

Add the multi-site module to $GERRIT_SITE/etc/gerrit.config as follows:

[gerrit]
  installDbModule = com.googlesource.gerrit.plugins.multisite.GitModule
  installModule = com.googlesource.gerrit.plugins.multisite.Module

For more details on the configuration settings, please refer to the multi-site configuration documentation.

You also need to setup the Git-level replication between nodes, for more details please refer to the replication plugin documentation.

HTTP endpoints

For information about available HTTP endpoints please refer to the documentation.