diff --git a/solr/core/src/java/org/apache/solr/cloud/DistributedApiAsyncTracker.java b/solr/core/src/java/org/apache/solr/cloud/DistributedApiAsyncTracker.java index 242c5d9a1984..556ea22211d9 100644 --- a/solr/core/src/java/org/apache/solr/cloud/DistributedApiAsyncTracker.java +++ b/solr/core/src/java/org/apache/solr/cloud/DistributedApiAsyncTracker.java @@ -364,9 +364,7 @@ State getInFlightState(String asyncId) throws KeeperException, InterruptedExcept // Unlikely race, but not impossible... if (log.isInfoEnabled()) { log.info( - "AsyncId ephemeral node " - + getPath(asyncId) - + " vanished from underneath us. Funny."); // nowarn + "AsyncId ephemeral node {} vanished from underneath us. Funny.", getPath(asyncId)); } return State.NOT_FOUND; } @@ -374,9 +372,8 @@ State getInFlightState(String asyncId) throws KeeperException, InterruptedExcept if (bytes == null) { // This is not expected. The ephemeral nodes are always created with content. log.error( - "AsyncId ephemeral node " - + getPath(asyncId) - + " has null content. This is unexpected (bug)."); // nowarn + "AsyncId ephemeral node {} has null content. This is unexpected (bug).", + getPath(asyncId)); return State.NOT_FOUND; } @@ -387,11 +384,9 @@ State getInFlightState(String asyncId) throws KeeperException, InterruptedExcept return State.SUBMITTED; } else { log.error( - "AsyncId ephemeral node " - + getPath(asyncId) - + " has unexpected content \"" - + content - + "\". This is unexpected (bug)."); // nowarn + "AsyncId ephemeral node {} has unexpected content \"{}\". This is unexpected (bug).", + getPath(asyncId), + content); return State.NOT_FOUND; } } diff --git a/solr/core/src/java/org/apache/solr/cloud/DistributedClusterStateUpdater.java b/solr/core/src/java/org/apache/solr/cloud/DistributedClusterStateUpdater.java index cac60d45ce19..3c4c152bdcf0 100644 --- a/solr/core/src/java/org/apache/solr/cloud/DistributedClusterStateUpdater.java +++ b/solr/core/src/java/org/apache/solr/cloud/DistributedClusterStateUpdater.java @@ -807,14 +807,11 @@ public void executeStateUpdates(SolrCloudManager scm, ZkStateReader zkStateReade throws KeeperException, InterruptedException { if (log.isDebugEnabled()) { log.debug( - "Executing updates for collection " - + collectionName - + ", is creation=" - + isCollectionCreation - + ", " - + mutations.size() - + " recorded mutations.", - new Exception("StackTraceOnly")); // nowarn + "Executing updates for collection {}, is creation={}, {} recorded mutations.", + collectionName, + isCollectionCreation, + mutations.size(), + new Exception("StackTraceOnly")); } if (mutations.isEmpty()) { final String err = @@ -925,10 +922,7 @@ public void computeUpdates(ClusterState clusterState, SolrZkClient client) { if (docCollection == null) { // This is possible but should be rare. Logging warn in case it is seen often and likely a // sign of another issue - log.warn( - "Processing DOWNNODE, collection " - + collectionName - + " disappeared during iteration"); // nowarn + log.warn("Processing DOWNNODE, collection {} disappeared during iteration", collectionName); } if (result.isPresent()) { diff --git a/solr/core/src/java/org/apache/solr/cloud/Overseer.java b/solr/core/src/java/org/apache/solr/cloud/Overseer.java index c1f3eefcdb20..11c745520707 100644 --- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java +++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java @@ -1053,9 +1053,8 @@ public void offerStateUpdate(byte[] data) throws KeeperException, InterruptedExc final ZkNodeProps message = ZkNodeProps.load(data); final String operation = message.getStr(QUEUE_OPERATION); log.error( - "Received unexpected message on Overseer cluster state updater for " - + operation - + " when distributed updates are configured"); // nowarn + "Received unexpected message on Overseer cluster state updater for {} when distributed updates are configured", + operation); throw new RuntimeException( "Message " + operation diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java index 30ff9a31996e..bcaf396cf11c 100644 --- a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java +++ b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java @@ -708,7 +708,7 @@ private boolean isSuccessful() { private void printTrackingMaps() { if (log.isDebugEnabled()) { log.debug("RunningTasks: {}", runningTasks.keySet()); - log.debug("BlockedTasks: {}", blockedTasks.keySet()); // nowarn + log.debug("BlockedTasks: {}", blockedTasks.keySet()); } } diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/DistributedCollectionConfigSetCommandRunner.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/DistributedCollectionConfigSetCommandRunner.java index a626af3c45c6..80797e0e91fb 100644 --- a/solr/core/src/java/org/apache/solr/cloud/api/collections/DistributedCollectionConfigSetCommandRunner.java +++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/DistributedCollectionConfigSetCommandRunner.java @@ -200,7 +200,7 @@ public void runConfigSetCommand( action, (String) result.get(ConfigSetCmds.BASE_CONFIGSET)); if (log.isInfoEnabled()) { - log.info("Running Config Set API locally for " + action + " " + configSetName); // nowarn + log.info("Running Config Set API locally for {} {}", action, configSetName); } ConfigSetCommandRunner commandRunner = diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerRoleCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerRoleCmd.java index 32f10bc1c6f0..af4ff42be667 100644 --- a/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerRoleCmd.java +++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerRoleCmd.java @@ -60,8 +60,8 @@ public void call(AdminCmdContext adminCmdContext, ZkNodeProps message, NamedList // No Overseer (not accessible from Collection API command execution in any case) so this // command can't be run... log.error( - "Cluster is running with distributed Collection API execution. Ignoring Collection API operation " - + operation); // nowarn + "Cluster is running with distributed Collection API execution. Ignoring Collection API operation {}", + operation); return; } ZkStateReader zkStateReader = ccc.getZkStateReader(); diff --git a/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java b/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java index 5fffe0099e1b..e39c6eddfff2 100644 --- a/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java +++ b/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java @@ -508,9 +508,7 @@ IndexFetchResult fetchLatestIndex(boolean forceReplication, boolean forceCoreRel if (log.isInfoEnabled()) { log.info("Follower's generation: {}", commit.getGeneration()); - log.info( - "Follower's version: {}", - IndexDeletionPolicyWrapper.getCommitTimestamp(commit)); // nowarn + log.info("Follower's version: {}", IndexDeletionPolicyWrapper.getCommitTimestamp(commit)); } // Leader's version is 0 and generation is 0 - not open for replication