(solr) branch branch_9x updated: Undo log validation exception for cross-dc

[houston]

This is an automated email from the ASF dual-hosted git repository.

houston pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/branch_9x by this push:
     new 05ca41613e4 Undo log validation exception for cross-dc
05ca41613e4 is described below

commit 05ca41613e4aadf01376185e9f2160f3d68d6c25
Author: Houston Putman <hous...@apache.org>
AuthorDate: Tue Jan 14 14:00:40 2025 -0600

    Undo log validation exception for cross-dc
    
    (cherry picked from commit 8942482299cbaee0b45c2f5b05f05fd3df13f511)
---
 gradle/validation/validate-log-calls.gradle                            | 2 +-
 .../cross-dc/src/java/org/apache/solr/crossdc/common/ConfUtil.java     | 2 +-
 .../src/java/org/apache/solr/crossdc/common/KafkaMirroringSink.java    | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/gradle/validation/validate-log-calls.gradle 
b/gradle/validation/validate-log-calls.gradle
index 44bc82f9ac1..fb1a81c5403 100644
--- a/gradle/validation/validate-log-calls.gradle
+++ b/gradle/validation/validate-log-calls.gradle
@@ -118,7 +118,7 @@ class ValidateLogCallsTask extends DefaultTask {
 
     if (hasPlus) {
       cause = "hasPlus: " + hasPlus
-      violation = level != "error"
+      violation = true
     }
     if (violation == false) {
       def m = stripped =~ "\\(.*?\\)"
diff --git 
a/solr/modules/cross-dc/src/java/org/apache/solr/crossdc/common/ConfUtil.java 
b/solr/modules/cross-dc/src/java/org/apache/solr/crossdc/common/ConfUtil.java
index 30213fbeabc..8fe185b8352 100644
--- 
a/solr/modules/cross-dc/src/java/org/apache/solr/crossdc/common/ConfUtil.java
+++ 
b/solr/modules/cross-dc/src/java/org/apache/solr/crossdc/common/ConfUtil.java
@@ -69,7 +69,7 @@ public class ConfUtil {
                   true);
 
           if (data == null) {
-            log.error(CrossDcConf.CROSSDC_PROPERTIES + " file in Zookeeper has 
no data");
+            log.error("{} file in Zookeeper has no data", 
CrossDcConf.CROSSDC_PROPERTIES);
             throw new SolrException(
                 SolrException.ErrorCode.SERVER_ERROR,
                 CrossDcConf.CROSSDC_PROPERTIES + " file in Zookeeper has no 
data");
diff --git 
a/solr/modules/cross-dc/src/java/org/apache/solr/crossdc/common/KafkaMirroringSink.java
 
b/solr/modules/cross-dc/src/java/org/apache/solr/crossdc/common/KafkaMirroringSink.java
index 85c2b985970..1a8ad622c0b 100644
--- 
a/solr/modules/cross-dc/src/java/org/apache/solr/crossdc/common/KafkaMirroringSink.java
+++ 
b/solr/modules/cross-dc/src/java/org/apache/solr/crossdc/common/KafkaMirroringSink.java
@@ -101,7 +101,8 @@ public class KafkaMirroringSink implements 
RequestMirroringSink, Closeable {
           (metadata, exception) -> {
             if (exception != null) {
               log.error(
-                  "Failed adding update to CrossDC queue! request=" + 
request.getSolrRequest(),
+                  "Failed adding update to CrossDC queue! request={}",
+                  request.getSolrRequest(),
                   exception);
             }
           });