commit 56337b97f2e596a6da31ce9216b7b52d05b0d94e
author Marcin Czech <maczech@gmail.com> Tue Oct 17 14:34:42 2023 +0200
committer Marcin Czech <maczech@gmail.com> Wed Oct 18 15:48:23 2023 +0200
tree c9aa8b7736b82d053f286436581c0ecd898a3440
parent cf8938bc4dab321dc554e837b8343d43be6494a7
parent f0222f020528cf36e0ddd081710527af6ad9ddd5

Merge branch 'stable-3.6' into stable-3.7

* stable-3.6:
  Remove redundant format calls in log calls
  Add put method to create/update global-refdb entry
  Add happy path test for BatchRefUpdateValidator
  Remove Maven legacy pom.xml
  Return immediately if local ref update fails
  Remove references to Zookeeper in logs
  Squash filter/findFirst/isPresent into anyMatch
  Fix typo in private method
  Bump Gerrit and module to v3.6.6
  Bump Gerrit and module to v3.5.6

Change-Id: Ibcc361909822c956b74721fdd8eee03649f1d8c5

src/main/java/com/gerritforge/gerrit/globalrefdb/validation/RefUpdateValidator.java

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 85e803a..ec8ff82 100644
--- a/src/main/java/com/gerritforge/gerrit/globalrefdb/validation/RefUpdateValidator.java
+++ b/src/main/java/com/gerritforge/gerrit/globalrefdb/validation/RefUpdateValidator.java
@@ -160,7 +160,7 @@
   private Boolean isRefToBeIgnored(String refName) {
     Boolean isRefToBeIgnored =
         ignoredRefs.stream().anyMatch(ignoredRefPrefix -> refName.startsWith(ignoredRefPrefix));
-    logger.atFine().log("Is project version update? %s", isRefToBeIgnored);
+    logger.atFine().log("Is project version update? %b", isRefToBeIgnored);
     return isRefToBeIgnored;
   }
 
@@ -176,7 +176,7 @@
 
   protected Boolean isGlobalProject(String projectName) {
     Boolean isGlobalProject = projectsFilter.matches(projectName);
-    logger.atFine().log("Is global project? %s", isGlobalProject);
+    logger.atFine().log("Is global project? %b", isGlobalProject);
     return isGlobalProject;
   }
 
@@ -218,12 +218,6 @@
         refEnforcement.getPolicy(projectName, refPair.getName());
     if (refEnforcementPolicy == EnforcePolicy.IGNORED) return;
 
-    String errorMessage =
-        String.format(
-            "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 global-refdb the value %s",
-            projectName, refPair.getName(), refPair.putValue);
     boolean succeeded;
     try {
       succeeded =
@@ -237,6 +231,12 @@
     }
 
     if (!succeeded) {
+      String errorMessage =
+          String.format(
+              "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 global-refdb the value %s",
+              projectName, refPair.getName(), refPair.putValue);
       throw new SharedDbSplitBrainException(errorMessage);
     }
   }