Merge branch 'stable-3.1'
* stable-3.1:
Rename plugin to zookeeper-refdb
Silence warning when repo is not up to date
Change-Id: I7711e13fd4f2eaafd4c9cfb9bc73d6c3bd4c6709
diff --git a/BUILD b/BUILD
index 548e384..80c7dda 100644
--- a/BUILD
+++ b/BUILD
@@ -7,12 +7,12 @@
)
gerrit_plugin(
- name = "zookeeper",
+ name = "zookeeper-refdb",
srcs = glob(["src/main/java/**/*.java"]),
manifest_entries = [
- "Gerrit-PluginName: zookeeper",
+ "Gerrit-PluginName: zookeeper-refdb",
"Gerrit-Module: com.googlesource.gerrit.plugins.validation.dfsrefdb.zookeeper.ZkValidationModule",
- "Implementation-Title: zookeeper plugin",
+ "Implementation-Title: zookeeper ref-db plugin",
"Implementation-URL: https://review.gerrithub.io/admin/repos/GerritForge/plugins_zookeeper",
],
resources = glob(["src/main/resources/**/*"]),
@@ -26,7 +26,7 @@
)
junit_tests(
- name = "zookeeper_tests",
+ name = "zookeeper-refdb_tests",
srcs = glob(["src/test/java/**/*.java"]),
resources = glob(["src/test/resources/**/*"]),
tags = [
@@ -34,16 +34,16 @@
"zookeeper",
],
deps = [
- ":zookeeper__plugin_test_deps",
+ ":zookeeper-refdb__plugin_test_deps",
],
)
java_library(
- name = "zookeeper__plugin_test_deps",
+ name = "zookeeper-refdb__plugin_test_deps",
testonly = 1,
visibility = ["//visibility:public"],
exports = PLUGIN_DEPS + PLUGIN_TEST_DEPS + [
- ":zookeeper__plugin",
+ ":zookeeper-refdb__plugin",
"@curator-framework//jar",
"@curator-recipes//jar",
"@curator-test//jar",
diff --git a/README.md b/README.md
index f92fc18..876d49b 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,16 @@
-# plugins_zookeeper
+# Gerrit Zookeeper ref-db
-Zookeeper plugin for Gerrit Code Review
+This plugin provides an implementation of the Gerrit global ref-db backed by
+[Apache Zookeeper](https://zookeeper.apache.org/).
+
+Requirements for using this plugin are:
+
+- Gerrit v3.2 or later
+- Apache Zookeeper v3.4 or later
+
+## Typical use-case
+
+The global ref-db is a typical use-case of a Gerrit multi-master scenario
+in a multi-site setup. Refer to the
+[Gerrit multi-site plugin](https://gerrit.googlesource.com/plugins/multi-site/+/master/DESIGN.md)
+for more details on the high level architecture.
diff --git a/src/main/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/zookeeper/ZkSharedRefDatabase.java b/src/main/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/zookeeper/ZkSharedRefDatabase.java
index c6f7854..7def5f2 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/zookeeper/ZkSharedRefDatabase.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/zookeeper/ZkSharedRefDatabase.java
@@ -64,7 +64,7 @@
// Assuming this is a delete node NULL_REF
if (valueInZk == null) {
- logger.atInfo().log(
+ logger.atFine().log(
"%s:%s not found in Zookeeper, assumed as delete node NULL_REF",
project, ref.getName());
return false;
@@ -74,7 +74,7 @@
Boolean isUpToDate = objectIdInSharedRefDb.equals(ref.getObjectId());
if (!isUpToDate) {
- logger.atWarning().log(
+ logger.atFine().log(
"%s:%s is out of sync: local=%s zk=%s",
project, ref.getName(), ref.getObjectId(), objectIdInSharedRefDb);
}
