commit | ecc0b62c32835564477352b34620a7ffdfa1aaf2 | [log] [tgz] |
---|---|---|
author | Antonio Barone <syntonyze@gmail.com> | Wed Aug 14 15:27:35 2019 +0100 |
committer | Marcin Czech <maczech@gmail.com> | Fri Aug 16 10:22:01 2019 +0100 |
tree | 2b48ceb211521ab5ffaed98096dc7373da867dfe | |
parent | 1240d4e05638f261a5f7830a7bf6d2d72df79104 [diff] | |
parent | 7169455597d29cc2ce8b307c78c17056d8163710 [diff] |
Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Format unformatted files Use SharedRefDatabaseWrapper in MultisiteReplicationPushFilter Add Singleton scope to SharedRefDatabase Bind SharedRefDB as DynamicItem to allow other implementations Log project deletion in sharedref_log Log acquiring and releasing sharedref locks Log blob updates in sharedref_log Do no store refs/cache-automerge in the shared ref-db Stop replication when instance is not aligned with SharedRefDb Move DisabledMessageLogger to tests Clean up unused SharedRefDatabase methods Introduce sharedRef database log file Avoid direct KafkaConsumer creation Inject SharedRefDatabaseWrapper at startup: Since stable-3.0, validation module is installed in dbInjector while the DynamicItem<SharedRefDatabase> is in sysInjector. This would make DynamicItem.bind() tricky because should be defined in sysInjector which isn't related to dbInjector. Workaround the problem by defining optional the injector of the DynamicItem<SharedRefDatabase> and delegate a new PluginStartup lifecycle listener to complete the injectors once both dbInjector and sysInjector are fully loaded. Change-Id: I5be1200f9745805667657d376496bd064e43b37b
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:
NOTE: The multi-site plugin will not start if Gerrit is not yet migrated to NoteDb.
Currently, the only mode supported is one primary read/write master and multiple read-only masters but eventually the plan is to support multiple read/write masters. The read/write master is handling any traffic while the read-only masters are serving the Gerrit GUI assets, the HTTP GET REST API and git fetch requests (git-upload-pack). The read-only masters are kept synchronized with the read/write master in order to be always ready to become a read/write master.
For more details on the overall multi-site design and roadmap, please refer to the multi-site plugin DESIGN.md document
This plugin is released under the same Apache 2.0 license and copyright holders as of the Gerrit Code Review project.
The multi-site plugin is built like any other Gerrit plugin 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.
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
Create the $GERRIT_SITE/etc/multi-site.config
on all Gerrit servers with the following basic settings:
[kafka] bootstrapServers = <kafka-host>:<kafka-port> [kafka "publisher"] enabled = true [kafka "subscriber"] enabled = true [ref-database] enabled = true [ref-database "zookeeper"] connectString = "localhost:2181"
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.