Remove references to Zookeeper in logs Zookeeper may be an implementation of GlobalRefDatabase, but the comments in this plugin need to be generic. Change-Id: I29d1711a6087ef0ea53e7b4c092c281537e50b6b
diff --git a/src/main/java/com/gerritforge/gerrit/globalrefdb/validation/RefUpdateValidator.java b/src/main/java/com/gerritforge/gerrit/globalrefdb/validation/RefUpdateValidator.java index 5972ad3..35ad560 100644 --- a/src/main/java/com/gerritforge/gerrit/globalrefdb/validation/RefUpdateValidator.java +++ b/src/main/java/com/gerritforge/gerrit/globalrefdb/validation/RefUpdateValidator.java
@@ -221,9 +221,9 @@ String errorMessage = String.format( - "Not able to persist the data in Zookeeper for project '%s' and ref '%s'," + "Not able to persist the data in SharedRef for project '%s' and ref '%s'," + "the cluster is now in Split Brain since the commit has been " - + "persisted locally but not in SharedRef the value %s", + + "persisted locally but not in global-refdb the value %s", projectName, refPair.getName(), refPair.putValue); boolean succeeded; try { @@ -232,7 +232,7 @@ Project.nameKey(projectName), refPair.compareRef, refPair.putValue); } catch (GlobalRefDbSystemError e) { logger.atWarning().withCause(e).log( - "Not able to persist the data in Zookeeper for project '{}' and ref '{}', message: {}", + "Not able to persist the data in global-refdb for project '{}' and ref '{}', message: {}", projectName, refPair.getName(), e.getMessage()); @@ -347,7 +347,7 @@ logger.atSevere().withCause(closingException).log( "Exception trying to release resource %s, " + "the locked resources won't be accessible in all cluster unless" - + " the lock is removed from ZK manually", + + " the lock is removed from global-refdb manually", closeable); } });
diff --git a/src/test/java/com/gerritforge/gerrit/globalrefdb/validation/BatchRefUpdateValidatorTest.java b/src/test/java/com/gerritforge/gerrit/globalrefdb/validation/BatchRefUpdateValidatorTest.java index bb572a8..ff18ed7 100644 --- a/src/test/java/com/gerritforge/gerrit/globalrefdb/validation/BatchRefUpdateValidatorTest.java +++ b/src/test/java/com/gerritforge/gerrit/globalrefdb/validation/BatchRefUpdateValidatorTest.java
@@ -91,7 +91,7 @@ } @Test - public void immutableChangeShouldNotBeWrittenIntoZk() throws Exception { + public void immutableChangeShouldNotBeWrittenIntoSharedRefDb() throws Exception { String AN_IMMUTABLE_REF = "refs/changes/01/1/1"; List<ReceiveCommand> cmds = Arrays.asList(new ReceiveCommand(A, B, AN_IMMUTABLE_REF, UPDATE));