Apache Solr open-source search software
SOLR-14910: Use in-line tags for logger declarations in Gradle ValidateLogCalls that are non-standard, change //logok to //nowarn
Erick Ericksonf6c4f8a75560
diff --git a/gradle/validation/validate-log-calls.gradle b/gradle/validation/validate-log-calls.gradleindex 741f4e76fe1..d759c74435e 100644--- a/gradle/validation/validate-log-calls.gradle+++ b/gradle/validation/validate-log-calls.gradle@@ -67,7 +67,7 @@ class ValidateLogCallsTask extends DefaultTask {boolean violation = false// If the line has been explicitly OK'd, then it's OK!- if (line.replaceAll("\\s", "").toLowerCase().contains("//logok")) {+ if (line.replaceAll("\\s", "").toLowerCase().contains("//nowarn")) {return}// Strip all of the comments, things in quotes and the like.@@ -133,7 +133,7 @@ class ValidateLogCallsTask extends DefaultTask {}// Always report toString(). Note, this over-reports some constructs- // but just add //logOK if it's really OK.+ // but just add //nowarn if it's really OK.if (violation == false) {if (line.contains("toString(") == true && prevLineNotIf) {cause = "Line contains toString"@@ -151,27 +151,13 @@ class ValidateLogCallsTask extends DefaultTask {return}-// Require all our logger definitions lower case "log", except a couple of special ones.+// Require all our logger definitions lower case "log", except if they have //nowarndef checkLogName(File file, String line) {// It's many times faster to do check this way than use a regexif (line.contains("static ") && line.contains("getLogger") && line.contains(" log ") == false) {- String name = file.name- if (name.equals("LoggerFactory.java")) {+ if (line.replaceAll("\\s", "").toLowerCase().contains("//nowarn")) {return}- if (name.equals("SolrCore.java") && (line.contains("requestLog") || line.contains("slowLog"))) {- return- }- if (name.equals("StartupLoggingUtils.java") && line.contains("getLoggerImplStr")) {- return- }- // Apparently the Hadoop code expectes upper-case LOG, so...-- if ((name.equals("HttpServer2.java") || name.equals("BlockPoolSlice.java") || name.equals("FileUtil.java"))- && line.contains(" LOG ")) {- return- }-reportViolation("Change the logger name to lower-case 'log' in " + file.name + " " + line + " project" + project)}}diff --git a/help/validateLogCalls.txt b/help/validateLogCalls.txtindex e150ba8a017..b177bdbd9f8 100644--- a/help/validateLogCalls.txt+++ b/help/validateLogCalls.txt@@ -60,7 +60,7 @@ NOTES:simple concatenation. This last is something of a style check.- You can get into some pretty convolued consructs trying to pass some of these- checks. Adding //logok, with or without spaces will cause the line to pass+ checks. Adding //nowarn, with or without spaces will cause the line to passno matter what. Please use this hack sparingly and be conscientious aboutsurrounding with 'if (log.is*Enabled)'.diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/StrategyTestCase.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/StrategyTestCase.javaindex 2fc68b44242..2b23a656eae 100644--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/StrategyTestCase.java+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/StrategyTestCase.java@@ -67,7 +67,7 @@ public abstract class StrategyTestCase extends SpatialTestCase {protected boolean storeShape = true;protected void executeQueries(SpatialMatchConcern concern, String... testQueryFile) throws IOException {- log.info("testing queried for strategy "+strategy); // logOk+ log.info("testing queried for strategy "+strategy); // nowarnfor( String path : testQueryFile ) {Iterator<SpatialTestQuery> testQueryIterator = getTestQueries(path, ctx);runTestQueries(testQueryIterator, concern);diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/HeatmapFacetCounterTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/HeatmapFacetCounterTest.javaindex 357a48774ca..5b719854d92 100644--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/HeatmapFacetCounterTest.java+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/HeatmapFacetCounterTest.java@@ -67,7 +67,7 @@ public class HeatmapFacetCounterTest extends StrategyTestCase {@Afterpublic void after() {- log.info("Validated " + cellsValidated + " cells, " + cellValidatedNonZero + " non-zero"); // logOK+ log.info("Validated " + cellsValidated + " cells, " + cellValidatedNonZero + " non-zero"); // nowarn}@Testdiff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpFuzzyPrefixTreeTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpFuzzyPrefixTreeTest.javaindex 97f3b382c38..6349060e24f 100644--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpFuzzyPrefixTreeTest.java+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpFuzzyPrefixTreeTest.java@@ -87,7 +87,7 @@ public class RandomSpatialOpFuzzyPrefixTreeTest extends StrategyTestCase {((PrefixTreeStrategy) strategy).setPointsOnly(true);}- log.info("Strategy: " + strategy.toString()); // logOk+ log.info("Strategy: " + strategy.toString()); // nowarn}private void setupCtx2D(SpatialContext ctx) {diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 66361d82f05..4960906d16e 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -294,6 +294,9 @@ Other Changes* SOLR-12987: Deprecated plugins/features are now logged once and with log category org.apache.solr.DEPRECATED(David Smiley)+* SOLR-14910: Use in-line tags for logger declarations in Gradle ValidateLogCalls that are non-standard,+ change //logok to //nowarn (Erick Erickson)+================== 8.6.2 ==================Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.javaindex 8e1f62564b5..e62cd0e2e2a 100644--- a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java+++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java@@ -163,7 +163,7 @@ public class CarrotClusteringEngine extends SearchClusteringEngine {if (attributeXmls.length > 0) {if (attributeXmls.length > 1) {log.warn("More than one attribute file found, first one will be used: {}"- , Arrays.toString(attributeXmls)); // logOk+ , Arrays.toString(attributeXmls)); // nowarn}withContextClassLoader(core.getResourceLoader().getClassLoader(), () -> {diff --git a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.javaindex 1b33ec948d2..f74e7b264c5 100644--- a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java+++ b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java@@ -230,7 +230,7 @@ public class ExtractingDocumentLoader extends ContentStreamLoader {} catch (TikaException e) {if(ignoreTikaException)log.warn(new StringBuilder("skip extracting text due to ").append(e.getLocalizedMessage())- .append(". metadata=").append(metadata.toString()).toString()); // logOk+ .append(". metadata=").append(metadata.toString()).toString()); // nowarnelsethrow new SolrException(SolrException.ErrorCode.SERVER_ERROR, e);}diff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/SchedulerMetricsCollector.java b/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/SchedulerMetricsCollector.javaindex 62763dfd73c..7607d1f9326 100644--- a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/SchedulerMetricsCollector.java+++ b/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/SchedulerMetricsCollector.java@@ -93,7 +93,7 @@ public class SchedulerMetricsCollector implements Closeable {try {metricSamples.addAll(future.get());} catch (ExecutionException e) {- log.error("Error occurred during metrics collection", e.getCause());//logok+ log.error("Error occurred during metrics collection", e.getCause());//nowarn// continue any ways; do not fail}}diff --git a/solr/core/src/java/org/apache/solr/cloud/ActiveReplicaWatcher.java b/solr/core/src/java/org/apache/solr/cloud/ActiveReplicaWatcher.javaindex 66406fa797a..9030c382430 100644--- a/solr/core/src/java/org/apache/solr/cloud/ActiveReplicaWatcher.java+++ b/solr/core/src/java/org/apache/solr/cloud/ActiveReplicaWatcher.java@@ -119,11 +119,11 @@ public class ActiveReplicaWatcher implements CollectionStateWatcher {log.debug("-- onStateChanged@{}: replicaIds={}, solrCoreNames={} {}\ncollectionState {}", Long.toHexString(hashCode()), replicaIds, solrCoreNames, (latch != null ? "\nlatch count=" + latch.getCount() : "")- , collectionState); // logOk+ , collectionState); // nowarn}if (collectionState == null) { // collection has been deleted - don't waitif (log.isDebugEnabled()) {- log.debug("-- collection deleted, decrementing latch by {} ", replicaIds.size() + solrCoreNames.size()); // logOk+ log.debug("-- collection deleted, decrementing latch by {} ", replicaIds.size() + solrCoreNames.size()); // nowarn}if (latch != null) {for (int i = 0; i < replicaIds.size() + solrCoreNames.size(); i++) {diff --git a/solr/core/src/java/org/apache/solr/cloud/CloudUtil.java b/solr/core/src/java/org/apache/solr/cloud/CloudUtil.javaindex 65de4ca6804..fc207311861 100644--- a/solr/core/src/java/org/apache/solr/cloud/CloudUtil.java+++ b/solr/core/src/java/org/apache/solr/cloud/CloudUtil.java@@ -93,7 +93,7 @@ public class CloudUtil {}log.error("{}",new SolrException(ErrorCode.SERVER_ERROR, "Will not load SolrCore " + desc.getName()- + " because it has been replaced due to failover.")); // logOk+ + " because it has been replaced due to failover.")); // nowarnthrow new SolrException(ErrorCode.SERVER_ERROR,"Will not load SolrCore " + desc.getName()+ " because it has been replaced due to failover.");diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.javaindex bcdec9a9627..2464a467c5e 100644--- a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java@@ -632,9 +632,9 @@ public class OverseerTaskProcessor implements Runnable, Closeable {private void printTrackingMaps() {if (log.isDebugEnabled()) {log.debug("RunningTasks: {}", runningTasks);- log.debug("BlockedTasks: {}", blockedTasks.keySet()); // logOk- log.debug("CompletedTasks: {}", completedTasks.keySet()); // logOk- log.debug("RunningZKTasks: {}", runningZKTasks); // logOk+ log.debug("BlockedTasks: {}", blockedTasks.keySet()); // nowarn+ log.debug("CompletedTasks: {}", completedTasks.keySet()); // nowarn+ log.debug("RunningZKTasks: {}", runningZKTasks); // nowarn}}diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.javaindex 2edb926ae1b..9ec9b467565 100644--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java@@ -189,8 +189,8 @@ public final class SolrCore implements SolrInfoBean, Closeable {public static final String version = "1.0";private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());- private static final Logger requestLog = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass().getName() + ".Request");- private static final Logger slowLog = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass().getName() + ".SlowRequest");+ private static final Logger requestLog = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass().getName() + ".Request"); //nowarn+ private static final Logger slowLog = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass().getName() + ".SlowRequest"); //nowarnprivate String name;private String logid; // used to show what name is setdiff --git a/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java b/solr/core/src/java/org/apache/solr/handler/IndexFetcher.javaindex c8a051280c1..66d195c0a12 100644--- a/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java+++ b/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java@@ -437,7 +437,7 @@ public class IndexFetcher {if (log.isInfoEnabled()) {log.info("Follower's generation: {}", commit.getGeneration());- log.info("Follower's version: {}", IndexDeletionPolicyWrapper.getCommitTimestamp(commit)); // logOK+ log.info("Follower's version: {}", IndexDeletionPolicyWrapper.getCommitTimestamp(commit)); // nowarn}if (latestVersion == 0L) {@@ -1249,7 +1249,7 @@ public class IndexFetcher {try {if (log.isInfoEnabled()) {log.info("From dir files: {}", Arrays.asList(tmpIdxDir.listAll()));- log.info("To dir files: {}", Arrays.asList(indexDir.listAll())); //logOk+ log.info("To dir files: {}", Arrays.asList(indexDir.listAll())); //nowarn}} catch (IOException e) {throw new RuntimeException(e);diff --git a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.javaindex b200ecc5001..2b5eb19b0ee 100644--- a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java@@ -1606,7 +1606,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw}fos.write(buf, 0, read);fos.flush();- log.debug("Wrote {} bytes for file {}", offset + read, fileName); // logOK+ log.debug("Wrote {} bytes for file {}", offset + read, fileName); // nowarn//Pause if necessarymaxBytesBeforePause += read;diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.javaindex 3c9e37cad3e..c2cefbc1e86 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java@@ -1349,7 +1349,7 @@ public class CollectionsHandler extends RequestHandlerBase implements Permissionsuccess = true;break;}- log.warn("Force leader attempt {}. Waiting 5 secs for an active leader. State of the slice: {}", (i + 1), slice); //logok+ log.warn("Force leader attempt {}. Waiting 5 secs for an active leader. State of the slice: {}", (i + 1), slice); //nowarn}if (success) {diff --git a/solr/core/src/java/org/apache/solr/handler/admin/PrepRecoveryOp.java b/solr/core/src/java/org/apache/solr/handler/admin/PrepRecoveryOp.javaindex e0be4e01f66..15be7463369 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/PrepRecoveryOp.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/PrepRecoveryOp.java@@ -135,7 +135,7 @@ class PrepRecoveryOp implements CoreAdminHandler.CoreAdminOp {", live=" + live + ", checkLive=" + checkLive + ", currentState=" + state+ ", localState=" + localState + ", nodeName=" + nodeName +", coreNodeName=" + coreNodeName + ", onlyIfActiveCheckResult=" + onlyIfActiveCheckResult- + ", nodeProps: " + replica); //LOGOK+ + ", nodeProps: " + replica); //nowarn}if (!onlyIfActiveCheckResult && replica != null && (state == waitForState || leaderDoesNotNeedRecovery)) {if (checkLive == null) {diff --git a/solr/core/src/java/org/apache/solr/security/HadoopAuthPlugin.java b/solr/core/src/java/org/apache/solr/security/HadoopAuthPlugin.javaindex 46962411254..f625c93ed2c 100644--- a/solr/core/src/java/org/apache/solr/security/HadoopAuthPlugin.java+++ b/solr/core/src/java/org/apache/solr/security/HadoopAuthPlugin.java@@ -233,7 +233,7 @@ public class HadoopAuthPlugin extends AuthenticationPlugin {log.info("----------HTTP Request---------");if (log.isInfoEnabled()) {log.info("{} : {}", request.getMethod(), request.getRequestURI());- log.info("Query : {}", request.getQueryString()); // logOk+ log.info("Query : {}", request.getQueryString()); // nowarn}log.info("Headers :");Enumeration<String> headers = request.getHeaderNames();diff --git a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.javaindex 5e7f70a692b..a24d025238c 100644--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java@@ -493,7 +493,7 @@ public class HttpSolrCall {}if (statusCode == AuthorizationResponse.FORBIDDEN.statusCode) {if (log.isDebugEnabled()) {- log.debug("UNAUTHORIZED auth header {} context : {}, msg: {}", req.getHeader("Authorization"), context, authResponse.getMessage()); // logOk+ log.debug("UNAUTHORIZED auth header {} context : {}, msg: {}", req.getHeader("Authorization"), context, authResponse.getMessage()); // nowarn}sendError(statusCode,"Unauthorized request, Response code: " + statusCode);@@ -503,7 +503,7 @@ public class HttpSolrCall {return RETURN;}if (!(statusCode == HttpStatus.SC_ACCEPTED) && !(statusCode == HttpStatus.SC_OK)) {- log.warn("ERROR {} during authentication: {}", statusCode, authResponse.getMessage()); // logOk+ log.warn("ERROR {} during authentication: {}", statusCode, authResponse.getMessage()); // nowarnsendError(statusCode,"ERROR during authorization, Response code: " + statusCode);if (shouldAudit(EventType.ERROR)) {diff --git a/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollator.java b/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollator.javaindex a4e754cf0a9..4ae6b88bd75 100644--- a/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollator.java+++ b/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollator.java@@ -184,7 +184,7 @@ public class SpellCheckCollator {collations.add(collation);}if (log.isDebugEnabled()) {- log.debug("Collation: {} {}", collationQueryStr, (verifyCandidateWithQuery ? (" will return " + hits + " hits.") : "")); // logOk+ log.debug("Collation: {} {}", collationQueryStr, (verifyCandidateWithQuery ? (" will return " + hits + " hits.") : "")); // nowarn}}return collations;diff --git a/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java b/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.javaindex 0e1806e57a3..2b8b86f92de 100644--- a/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java+++ b/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java@@ -312,7 +312,7 @@ public class SolrIndexSplitter {for (int segmentNumber = 0; segmentNumber<leaves.size(); segmentNumber++) {if (log.isInfoEnabled()) {log.info("SolrIndexSplitter: partition # {} partitionCount={} {} segment #={} segmentCount={}", partitionNumber, numPieces- , (ranges != null ? " range=" + ranges.get(partitionNumber) : ""), segmentNumber, leaves.size()); // logOk+ , (ranges != null ? " range=" + ranges.get(partitionNumber) : ""), segmentNumber, leaves.size()); // nowarn}CodecReader subReader = SlowCodecReaderWrapper.wrap(leaves.get(segmentNumber).reader());iw.addIndexes(new LiveDocsReader(subReader, segmentDocSets.get(segmentNumber)[partitionNumber]));diff --git a/solr/core/src/java/org/apache/solr/util/StartupLoggingUtils.java b/solr/core/src/java/org/apache/solr/util/StartupLoggingUtils.javaindex 6bc18c363b6..53f19b9fff4 100644--- a/solr/core/src/java/org/apache/solr/util/StartupLoggingUtils.java+++ b/solr/core/src/java/org/apache/solr/util/StartupLoggingUtils.java@@ -53,7 +53,7 @@ public final class StartupLoggingUtils {}}- public static String getLoggerImplStr() {+ public static String getLoggerImplStr() { //nowarnreturn binder.getLoggerFactoryClassStr();}diff --git a/solr/core/src/test/org/apache/hadoop/fs/FileUtil.java b/solr/core/src/test/org/apache/hadoop/fs/FileUtil.javaindex 4b343568a22..89879e559c2 100644--- a/solr/core/src/test/org/apache/hadoop/fs/FileUtil.java+++ b/solr/core/src/test/org/apache/hadoop/fs/FileUtil.java@@ -76,7 +76,8 @@ import org.slf4j.LoggerFactory;public class FileUtil {public static final Object SOLR_HACK_FOR_CLASS_VERIFICATION = new Object();- private static final Logger LOG = LoggerFactory.getLogger(FileUtil.class);+ // Apparently the Hadoop code expectes upper-case LOG, so...+ private static final Logger LOG = LoggerFactory.getLogger(FileUtil.class); //nowarn/* The error code is defined in winutils to indicate insufficient* privilege to create symbolic links. This value need to keep indiff --git a/solr/core/src/test/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java b/solr/core/src/test/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.javaindex 9cba3fb1ff3..c75ef8df72d 100644--- a/solr/core/src/test/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java+++ b/solr/core/src/test/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java@@ -81,7 +81,8 @@ import com.google.common.annotations.VisibleForTesting;public class BlockPoolSlice {public static final Object SOLR_HACK_FOR_CLASS_VERIFICATION = new Object();- static final Logger LOG = LoggerFactory.getLogger(BlockPoolSlice.class);+ // Apparently the Hadoop code expectes upper-case LOG, so...+ static final Logger LOG = LoggerFactory.getLogger(BlockPoolSlice.class); //nowarnprivate final String bpid;private final FsVolumeImpl volume; // volume to which this BlockPool belongs todiff --git a/solr/core/src/test/org/apache/hadoop/http/HttpServer2.java b/solr/core/src/test/org/apache/hadoop/http/HttpServer2.javaindex 0767d4f8f85..274dd45f5f0 100644--- a/solr/core/src/test/org/apache/hadoop/http/HttpServer2.java+++ b/solr/core/src/test/org/apache/hadoop/http/HttpServer2.java@@ -118,7 +118,8 @@ import org.slf4j.LoggerFactory;public final class HttpServer2 implements FilterContainer {public static final Object SOLR_HACK_FOR_CLASS_VERIFICATION = new Object();- public static final Logger LOG = LoggerFactory.getLogger(HttpServer2.class);+ // Apparently the Hadoop code expectes upper-case LOG, so...+ public static final Logger LOG = LoggerFactory.getLogger(HttpServer2.class); //nowarnpublic static final String HTTP_SCHEME = "http";public static final String HTTPS_SCHEME = "https";diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderWithPullReplicasTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderWithPullReplicasTest.javaindex bf359326080..33afa703898 100644--- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderWithPullReplicasTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderWithPullReplicasTest.java@@ -206,7 +206,7 @@ public class ChaosMonkeySafeLeaderWithPullReplicasTest extends AbstractFullDistrif (log.isInfoEnabled()) {log.info("control docs:{}\n\n", controlClient.query(new SolrQuery("*:*")).getResults().getNumFound());- log.info("collection state: {}", printClusterStateInfo(DEFAULT_COLLECTION)); // logOk+ log.info("collection state: {}", printClusterStateInfo(DEFAULT_COLLECTION)); // nowarn}waitForReplicationFromReplicas(DEFAULT_COLLECTION, cloudClient.getZkStateReader(), new TimeOut(30, TimeUnit.SECONDS, TimeSource.NANO_TIME));diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.javaindex 99c40640505..e6d26f99f20 100644--- a/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java@@ -99,7 +99,7 @@ public class OverseerRolesTest extends SolrCloudTestCase {private void logOverseerState() throws KeeperException, InterruptedException {if (log.isInfoEnabled()) {log.info("Overseer: {}", getLeaderNode(zkClient()));- log.info("Election queue: {}", getSortedElectionNodes(zkClient(), "/overseer_elect/election")); // logOk+ log.info("Election queue: {}", getSortedElectionNodes(zkClient(), "/overseer_elect/election")); // nowarn}}diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.javaindex ebb6c75aa64..b6372a03dc3 100644--- a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java@@ -1171,14 +1171,14 @@ public class OverseerTest extends SolrTestCaseJ4 {Snapshot snapshot = timer.getSnapshot();if (log.isInfoEnabled()) {log.info("\t avgRequestsPerSecond: {}", timer.getMeanRate());- log.info("\t 5minRateRequestsPerSecond: {}", timer.getFiveMinuteRate()); // logOk- log.info("\t 15minRateRequestsPerSecond: {}", timer.getFifteenMinuteRate()); // logOk- log.info("\t avgTimePerRequest: {}", nsToMs(snapshot.getMean())); // logOk- log.info("\t medianRequestTime: {}", nsToMs(snapshot.getMedian())); // logOk- log.info("\t 75thPcRequestTime: {}", nsToMs(snapshot.get75thPercentile())); // logOk- log.info("\t 95thPcRequestTime: {}", nsToMs(snapshot.get95thPercentile())); // logOk- log.info("\t 99thPcRequestTime: {}", nsToMs(snapshot.get99thPercentile())); // logOk- log.info("\t 999thPcRequestTime: {}", nsToMs(snapshot.get999thPercentile())); // logOk+ log.info("\t 5minRateRequestsPerSecond: {}", timer.getFiveMinuteRate()); // nowarn+ log.info("\t 15minRateRequestsPerSecond: {}", timer.getFifteenMinuteRate()); // nowarn+ log.info("\t avgTimePerRequest: {}", nsToMs(snapshot.getMean())); // nowarn+ log.info("\t medianRequestTime: {}", nsToMs(snapshot.getMedian())); // nowarn+ log.info("\t 75thPcRequestTime: {}", nsToMs(snapshot.get75thPercentile())); // nowarn+ log.info("\t 95thPcRequestTime: {}", nsToMs(snapshot.get95thPercentile())); // nowarn+ log.info("\t 99thPcRequestTime: {}", nsToMs(snapshot.get99thPercentile())); // nowarn+ log.info("\t 999thPcRequestTime: {}", nsToMs(snapshot.get999thPercentile())); // nowarn}}diff --git a/solr/core/src/test/org/apache/solr/cloud/RollingRestartTest.java b/solr/core/src/test/org/apache/solr/cloud/RollingRestartTest.javaindex 164db2578af..8941e0dee7e 100644--- a/solr/core/src/test/org/apache/solr/cloud/RollingRestartTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/RollingRestartTest.java@@ -83,7 +83,7 @@ public class RollingRestartTest extends AbstractFullDistribZkTestBase {boolean sawLiveDesignate = false;int numRestarts = 1 + random().nextInt(TEST_NIGHTLY ? 12 : 2);for (int i = 0; i < numRestarts; i++) {- log.info("Rolling restart #{}", i + 1); // logOk+ log.info("Rolling restart #{}", i + 1); // nowarnfor (CloudJettyRunner cloudJetty : designateJettys) {log.info("Restarting {}", cloudJetty);chaosMonkey.stopJetty(cloudJetty);diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.javaindex c538551811a..3c640da5089 100644--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java@@ -752,7 +752,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 {break;} catch (NumberFormatException | AssertionError notYet) {if (log.isInfoEnabled()) {- log.info("{}th attempt failure on {} details are {}", retries + 1, notYet, followerDetails); // logOk+ log.info("{}th attempt failure on {} details are {}", retries + 1, notYet, followerDetails); // nowarn}if (retries>9) {log.error("giving up: ", notYet);diff --git a/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java b/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.javaindex 9b977eeb55b..c23a4f030c9 100644--- a/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java+++ b/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java@@ -265,7 +265,7 @@ public class BasicAuthIntegrationTest extends SolrCloudAuthTestCase {assertTrue(obj.containsKey("memory"));} catch (Exception e) {log.error("RunExampleTool failed due to: {}; stdout from tool prior to failure: {}"- , e, baos.toString(StandardCharsets.UTF_8.name())); // logOk+ , e, baos.toString(StandardCharsets.UTF_8.name())); // nowarn}SolrParams params = new MapSolrParams(Collections.singletonMap("q", "*:*"));diff --git a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.javaindex 2214f88db9e..baf6320ced6 100644--- a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java+++ b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java@@ -943,7 +943,7 @@ public class TestInPlaceUpdatesDistrib extends AbstractFullDistribZkTestBase {if (log.isInfoEnabled()) {log.info("Non leader 0: {}", ((HttpSolrClient) NONLEADERS.get(0)).getBaseURL());- log.info("Non leader 1: {}", ((HttpSolrClient) NONLEADERS.get(1)).getBaseURL()); // logOk+ log.info("Non leader 1: {}", ((HttpSolrClient) NONLEADERS.get(1)).getBaseURL()); // nowarn}SolrDocument doc0 = NONLEADERS.get(0).getById(String.valueOf(0), params("distrib", "false"));@@ -1034,7 +1034,7 @@ public class TestInPlaceUpdatesDistrib extends AbstractFullDistribZkTestBase {if (log.isInfoEnabled()) {log.info("Testing client (Fetch missing test): {}", ((HttpSolrClient) client).getBaseURL());log.info("Version at {} is: {}"- , ((HttpSolrClient) client).getBaseURL(), getReplicaValue(client, 1, "_version_")); // logOk+ , ((HttpSolrClient) client).getBaseURL(), getReplicaValue(client, 1, "_version_")); // nowarn}assertReplicaValue(client, 1, "inplace_updatable_float", (newinplace_updatable_float + 2.0f),"inplace_updatable_float didn't match for replica at client: " + ((HttpSolrClient) client).getBaseURL());@@ -1344,7 +1344,7 @@ public class TestInPlaceUpdatesDistrib extends AbstractFullDistribZkTestBase {if (log.isInfoEnabled()) {log.info("Testing client (testDBQUsingUpdatedFieldFromDroppedUpdate): {}", ((HttpSolrClient) client).getBaseURL());log.info("Version at {} is: {}", ((HttpSolrClient) client).getBaseURL(),- getReplicaValue(client, 1, "_version_")); // logOk+ getReplicaValue(client, 1, "_version_")); // nowarn}assertNull(client.getById("1", params("distrib", "false")));}diff --git a/solr/core/src/test/org/apache/solr/update/processor/CategoryRoutedAliasUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/CategoryRoutedAliasUpdateProcessorTest.javaindex 618013ec7cc..9e3d6b8af6f 100644--- a/solr/core/src/test/org/apache/solr/update/processor/CategoryRoutedAliasUpdateProcessorTest.java+++ b/solr/core/src/test/org/apache/solr/update/processor/CategoryRoutedAliasUpdateProcessorTest.java@@ -76,7 +76,7 @@ public class CategoryRoutedAliasUpdateProcessorTest extends RoutedAliasUpdatePro//log this to help debug potential causes of problemsif (log.isInfoEnabled()) {log.info("SolrClient: {}", solrClient);- log.info("ClusterStateProvider {}", solrClient.getClusterStateProvider()); // logOk+ log.info("ClusterStateProvider {}", solrClient.getClusterStateProvider()); // nowarn}}diff --git a/solr/core/src/test/org/apache/solr/update/processor/DimensionalRoutedAliasUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/DimensionalRoutedAliasUpdateProcessorTest.javaindex 59aced6f5bc..ef516de42ce 100644--- a/solr/core/src/test/org/apache/solr/update/processor/DimensionalRoutedAliasUpdateProcessorTest.java+++ b/solr/core/src/test/org/apache/solr/update/processor/DimensionalRoutedAliasUpdateProcessorTest.java@@ -74,7 +74,7 @@ public class DimensionalRoutedAliasUpdateProcessorTest extends RoutedAliasUpdate//log this to help debug potential causes of problemsif (log.isInfoEnabled()) {log.info("SolrClient: {}", solrClient);- log.info("ClusterStateProvider {}", solrClient.getClusterStateProvider()); // logOk+ log.info("ClusterStateProvider {}", solrClient.getClusterStateProvider()); // nowarn}}diff --git a/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.javaindex c3214f40f4d..51416013638 100644--- a/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java+++ b/solr/core/src/test/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessorTest.java@@ -91,7 +91,7 @@ public class TimeRoutedAliasUpdateProcessorTest extends RoutedAliasUpdateProcess//log this to help debug potential causes of problemsif (log.isInfoEnabled()) {log.info("SolrClient: {}", solrClient);- log.info("ClusterStateProvider {}", solrClient.getClusterStateProvider()); // logOk+ log.info("ClusterStateProvider {}", solrClient.getClusterStateProvider()); // nowarn}}diff --git a/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java b/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.javaindex 5721ecde8e9..c15abeddb0f 100644--- a/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java+++ b/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java@@ -359,7 +359,7 @@ public class TestSolrCLIRunExample extends SolrTestCaseJ4 {assertEquals("it should be ok "+tool+" "+Arrays.toString(toolArgs),0, status);} catch (Exception e) {log.error("RunExampleTool failed due to: {}; stdout from tool prior to failure: {}"- , e , baos.toString(StandardCharsets.UTF_8.name())); // logOk+ , e , baos.toString(StandardCharsets.UTF_8.name())); // nowarnthrow e;}diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/NodesSysPropsCacher.java b/solr/solrj/src/java/org/apache/solr/common/cloud/NodesSysPropsCacher.javaindex 8d185a2e5f7..7283f0c6b0d 100644--- a/solr/solrj/src/java/org/apache/solr/common/cloud/NodesSysPropsCacher.java+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/NodesSysPropsCacher.java@@ -154,10 +154,10 @@ public class NodesSysPropsCacher implements SolrCloseable {Thread.sleep(backOffTime);} catch (InterruptedException e1) {Thread.currentThread().interrupt();- log.info("Exception on caching node:{} system.properties:{}, retry {}/{}", node, tags, i+1, NUM_RETRY, e); // logOk+ log.info("Exception on caching node:{} system.properties:{}, retry {}/{}", node, tags, i+1, NUM_RETRY, e); // nowarnbreak;}- log.info("Exception on caching node:{} system.properties:{}, retry {}/{}", node, tags, i+1, NUM_RETRY, e); // logOk+ log.info("Exception on caching node:{} system.properties:{}, retry {}/{}", node, tags, i+1, NUM_RETRY, e); // nowarn}}}diff --git a/solr/solrj/src/java/org/apache/solr/common/util/Utils.java b/solr/solrj/src/java/org/apache/solr/common/util/Utils.javaindex b4f1f472d58..3cb817b9d62 100644--- a/solr/solrj/src/java/org/apache/solr/common/util/Utils.java+++ b/solr/solrj/src/java/org/apache/solr/common/util/Utils.java@@ -800,7 +800,7 @@ public class Utils {int statusCode = rsp.getStatusLine().getStatusCode();if (statusCode != 200) {try {- log.error("Failed a request to: {}, status: {}, body: {}", url, rsp.getStatusLine(), EntityUtils.toString(rsp.getEntity(), StandardCharsets.UTF_8)); // logOk+ log.error("Failed a request to: {}, status: {}, body: {}", url, rsp.getStatusLine(), EntityUtils.toString(rsp.getEntity(), StandardCharsets.UTF_8)); // nowarn} catch (IOException e) {log.error("could not print error", e);}diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.javaindex 5c01018aa26..0b3dce1587f 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java@@ -431,7 +431,7 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTesif (useTlogReplicas()) {if (log.isInfoEnabled()) {log.info("create jetty {} in directory {} of type {} in shard {}"- , i, jettyDir, Replica.Type.TLOG, ((currentI % sliceCount) + 1)); // logOk+ , i, jettyDir, Replica.Type.TLOG, ((currentI % sliceCount) + 1)); // nowarn}customThreadPool.submit(() -> {try {@@ -463,7 +463,7 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes} else {if (log.isInfoEnabled()) {log.info("create jetty {} in directory {} of type {} for shard{}"- , i, jettyDir, Replica.Type.NRT, ((currentI % sliceCount) + 1)); // logOk+ , i, jettyDir, Replica.Type.NRT, ((currentI % sliceCount) + 1)); // nowarn}customThreadPool.submit(() -> {@@ -492,7 +492,7 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTesaddedReplicas++;}} else {- log.info("create jetty {} in directory {} of type {} for shard{}", i, jettyDir, Replica.Type.PULL, ((currentI % sliceCount) + 1)); // logOk+ log.info("create jetty {} in directory {} of type {} for shard{}", i, jettyDir, Replica.Type.PULL, ((currentI % sliceCount) + 1)); // nowarncustomThreadPool.submit(() -> {try {JettySolrRunner j = createJetty(jettyDir, useJettyDataDir ? getDataDir(testDir + "/jetty"