You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2020/01/23 08:31:29 UTC
[lucene-solr] branch branch_8x updated: SOLR-14207: Fix logging
statements with less or more arguments than placeholders
This is an automated email from the ASF dual-hosted git repository.
shalin pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8x by this push:
new 0dea3c7 SOLR-14207: Fix logging statements with less or more arguments than placeholders
0dea3c7 is described below
commit 0dea3c7060b3c3c219a550c5ecdceea86e34c403
Author: Shalin Shekhar Mangar <sh...@apache.org>
AuthorDate: Thu Jan 23 14:00:08 2020 +0530
SOLR-14207: Fix logging statements with less or more arguments than placeholders
(cherry picked from commit 04193d5252bcbdb30d0e29447a72d4e9006e7f3f)
---
solr/CHANGES.txt | 2 ++
.../src/java/org/apache/solr/prometheus/exporter/SolrExporter.java | 4 ++--
solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java | 2 +-
.../java/org/apache/solr/cloud/api/collections/DeleteSnapshotCmd.java | 2 +-
solr/core/src/java/org/apache/solr/handler/CdcrReplicatorState.java | 2 +-
.../src/java/org/apache/solr/handler/CdcrUpdateLogSynchronizer.java | 2 +-
.../src/java/org/apache/solr/handler/admin/SecurityConfHandler.java | 2 +-
solr/core/src/java/org/apache/solr/handler/loader/JsonLoader.java | 2 +-
solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java | 2 +-
.../src/java/org/apache/solr/metrics/reporters/solr/SolrReporter.java | 2 +-
solr/core/src/java/org/apache/solr/update/HdfsUpdateLog.java | 2 +-
solr/core/src/java/org/apache/solr/update/UpdateLog.java | 2 +-
.../src/test/org/apache/solr/cloud/SystemCollectionCompatTest.java | 2 +-
solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java | 2 +-
solr/core/src/test/org/apache/solr/handler/TestBlobHandler.java | 2 +-
.../src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java | 4 ++--
16 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 027bbf2..27ebb44 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -148,6 +148,8 @@ Bug Fixes
* SOLR-11746: Adding existence queries for PointFields. DocValuesFieldExistsQuery and NormsFieldExistsQuery are used for existence queries when possible. (Houston Putman, hossman, Kai Chan)
+* SOLR-14207: Fix logging statements with less or more arguments than placeholders. (shalin)
+
Other Changes
---------------------
diff --git a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrExporter.java b/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrExporter.java
index 5394845..9df9746 100644
--- a/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrExporter.java
+++ b/solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrExporter.java
@@ -194,7 +194,7 @@ public class SolrExporter {
}
if (scrapeConfiguration == null) {
- log.error("Must provide either %s or %s", ARG_BASE_URL_FLAGS, ARG_ZK_HOST_FLAGS);
+ log.error("Must provide either {} or {}", ARG_BASE_URL_FLAGS, ARG_ZK_HOST_FLAGS);
}
SolrExporter solrExporter = new SolrExporter(
@@ -219,7 +219,7 @@ public class SolrExporter {
XmlConfigFile config = new XmlConfigFile(loader, configPath.getFileName().toString());
return MetricsConfiguration.from(config);
} catch (Exception e) {
- log.error("Could not load scrape configuration from %s", configPath.toAbsolutePath());
+ log.error("Could not load scrape configuration from {}", configPath.toAbsolutePath());
throw new RuntimeException(e);
}
}
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 618b5b6..01cd829 100644
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java
@@ -304,7 +304,7 @@ public class OverseerTaskProcessor implements Runnable, Closeable {
continue;
} catch (InterruptedException e) {
lock.unlock();
- log.error("Thread interrupted while trying to pick task for execution.", head.getId());
+ log.error("Thread interrupted while trying to pick task {} for execution.", head.getId());
Thread.currentThread().interrupt();
continue;
}
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteSnapshotCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteSnapshotCmd.java
index 634692d..d73e20c 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteSnapshotCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteSnapshotCmd.java
@@ -153,7 +153,7 @@ public class DeleteSnapshotCmd implements OverseerCollectionMessageHandler.Cmd {
CollectionSnapshotMetaData newResult = new CollectionSnapshotMetaData(meta.get().getName(), SnapshotStatus.Failed,
meta.get().getCreationDate(), replicasWithSnapshot);
SolrSnapshotManager.updateCollectionLevelSnapshot(zkClient, collectionName, newResult);
- log.info("Saved snapshot information for collection={} with commitName={} in Zookeeper as follows", collectionName, commitName,
+ log.info("Saved snapshot information for collection={} with commitName={} in Zookeeper as follows: {}", collectionName, commitName,
Utils.toJSON(newResult));
throw new SolrException(ErrorCode.SERVER_ERROR, "Failed to delete snapshot on cores " + coresWithSnapshot);
diff --git a/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorState.java b/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorState.java
index bf80608..f5aaa30 100644
--- a/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorState.java
+++ b/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorState.java
@@ -100,7 +100,7 @@ class CdcrReplicatorState {
try {
targetClient.close();
} catch (IOException ioe) {
- log.warn("Caught exception trying to close server: ", ioe.getMessage());
+ log.warn("Caught exception trying to close server: {}", ioe.getMessage());
}
this.closeLogReader();
}
diff --git a/solr/core/src/java/org/apache/solr/handler/CdcrUpdateLogSynchronizer.java b/solr/core/src/java/org/apache/solr/handler/CdcrUpdateLogSynchronizer.java
index 80f27ce..91af819 100644
--- a/solr/core/src/java/org/apache/solr/handler/CdcrUpdateLogSynchronizer.java
+++ b/solr/core/src/java/org/apache/solr/handler/CdcrUpdateLogSynchronizer.java
@@ -155,7 +155,7 @@ class CdcrUpdateLogSynchronizer implements CdcrStateManager.CdcrStateObserver {
try {
server.close();
} catch (IOException ioe) {
- log.warn("Caught exception trying to close server: ", leaderUrl, ioe.getMessage());
+ log.warn("Caught exception trying to close client to {}: {}", leaderUrl, ioe.getMessage());
}
}
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/SecurityConfHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/SecurityConfHandler.java
index 510ef48..aff30a4 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/SecurityConfHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/SecurityConfHandler.java
@@ -136,7 +136,7 @@ public abstract class SecurityConfHandler extends RequestHandlerBase implements
return;
}
}
- log.debug("Security edit operation failed {} time(s)" + count);
+ log.debug("Security edit operation failed {} time(s)", count);
}
throw new SolrException(SERVER_ERROR, "Failed to persist security config after 3 attempts. Giving up");
}
diff --git a/solr/core/src/java/org/apache/solr/handler/loader/JsonLoader.java b/solr/core/src/java/org/apache/solr/handler/loader/JsonLoader.java
index 5e11ff1..17e6633 100644
--- a/solr/core/src/java/org/apache/solr/handler/loader/JsonLoader.java
+++ b/solr/core/src/java/org/apache/solr/handler/loader/JsonLoader.java
@@ -114,7 +114,7 @@ public class JsonLoader extends ContentStreamLoader {
reader = stream.getReader();
if (log.isTraceEnabled()) {
String body = IOUtils.toString(reader);
- log.trace("body", body);
+ log.trace("body: {}", body);
reader = new StringReader(body);
}
diff --git a/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java b/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java
index 724a40c..76ada8d 100644
--- a/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java
+++ b/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java
@@ -178,7 +178,7 @@ public class XMLLoader extends ContentStreamLoader {
final byte[] body = IOUtils.toByteArray(is);
// TODO: The charset may be wrong, as the real charset is later
// determined by the XML parser, the content-type is only used as a hint!
- log.trace("body", new String(body, (charset == null) ?
+ log.trace("body: {}", new String(body, (charset == null) ?
ContentStreamBase.DEFAULT_CHARSET : charset));
IOUtils.closeQuietly(is);
is = new ByteArrayInputStream(body);
diff --git a/solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrReporter.java b/solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrReporter.java
index 59e25d4..66a7ae9 100644
--- a/solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrReporter.java
+++ b/solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrReporter.java
@@ -404,7 +404,7 @@ public class SolrReporter extends ScheduledReporter {
//log.info("%%% sending to " + url + ": " + req.getParams());
solr.request(req);
} catch (Exception e) {
- log.debug("Error sending metric report", e.toString());
+ log.debug("Error sending metric report: {}", e.toString());
}
}
diff --git a/solr/core/src/java/org/apache/solr/update/HdfsUpdateLog.java b/solr/core/src/java/org/apache/solr/update/HdfsUpdateLog.java
index 2235f05..9e8499e 100644
--- a/solr/core/src/java/org/apache/solr/update/HdfsUpdateLog.java
+++ b/solr/core/src/java/org/apache/solr/update/HdfsUpdateLog.java
@@ -123,7 +123,7 @@ public class HdfsUpdateLog extends UpdateLog {
}
} else {
if (debug) {
- log.debug("UpdateHandler init: tlogDir=" + tlogDir + ", next id=" + id,
+ log.debug("UpdateHandler init: tlogDir=" + tlogDir + ", next id=" + id +
" this is a reopen or double init ... nothing else to do.");
}
versionInfo.reload();
diff --git a/solr/core/src/java/org/apache/solr/update/UpdateLog.java b/solr/core/src/java/org/apache/solr/update/UpdateLog.java
index 612bc6e..17d9bae 100644
--- a/solr/core/src/java/org/apache/solr/update/UpdateLog.java
+++ b/solr/core/src/java/org/apache/solr/update/UpdateLog.java
@@ -363,7 +363,7 @@ public class UpdateLog implements PluginInfoInitialized, SolrMetricProducer {
core.getCoreMetricManager().registerMetricProducer(SolrInfoBean.Category.TLOG.toString(), this);
if (debug) {
- log.debug("UpdateHandler init: tlogDir=" + tlogDir + ", next id=" + id, " this is a reopen... nothing else to do.");
+ log.debug("UpdateHandler init: tlogDir=" + tlogDir + ", next id=" + id + " this is a reopen... nothing else to do.");
}
return;
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/SystemCollectionCompatTest.java b/solr/core/src/test/org/apache/solr/cloud/SystemCollectionCompatTest.java
index a37c791..2c36d70 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SystemCollectionCompatTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SystemCollectionCompatTest.java
@@ -150,7 +150,7 @@ public class SystemCollectionCompatTest extends SolrCloudTestCase {
CollectionAdminResponse adminResponse = status.process(solrClient);
NamedList<Object> response = adminResponse.getResponse();
String leader = (String) response.get("leader");
- log.info("Overseer Status indicates that the overseer is: {}");
+ log.info("Overseer Status indicates that the overseer is: {}", leader);
JettySolrRunner overseerNode = null;
List<JettySolrRunner> jettySolrRunners = cluster.getJettySolrRunners();
for (int i = 0; i < jettySolrRunners.size(); i++) {
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java
index 271596f..3e73bb2 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java
@@ -432,7 +432,7 @@ public class TestTlogReplica extends SolrCloudTestCase {
if (respone.isSuccess()) {
break;
}
- log.error("Unsuccessful atempt to add replica. Attempt: %d/%d", i, maxAttempts);
+ log.error("Unsuccessful attempt to add replica. Attempt: {}/{}", i, maxAttempts);
} catch (SolrException e) {
log.error("Exception while adding replica. Attempt: " + i + "/" + maxAttempts, e);
}
diff --git a/solr/core/src/test/org/apache/solr/handler/TestBlobHandler.java b/solr/core/src/test/org/apache/solr/handler/TestBlobHandler.java
index 32ecc9e..c1cfecb 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestBlobHandler.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestBlobHandler.java
@@ -180,7 +180,7 @@ public class TestBlobHandler extends AbstractFullDistribZkTestBase {
Map m = (Map) fromJSONString(response);
assertFalse("Error in posting blob " + m.toString(), m.containsKey("error"));
} catch (JSONParser.ParseException e) {
- log.error("$ERROR$", response, e);
+ log.error("$ERROR$: {}", response, e);
fail();
}
} finally {
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.java
index f2bd410..2f80d21 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
@@ -464,7 +464,7 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes
addedReplicas++;
} else {
- log.info("create jetty {} in directory {} of type {}", i, jettyDir, Replica.Type.NRT, ((currentI % sliceCount) + 1));
+ log.info("create jetty {} in directory {} of type {} for shard{}", i, jettyDir, Replica.Type.NRT, ((currentI % sliceCount) + 1));
customThreadPool.submit(() -> {
try {
@@ -492,7 +492,7 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes
addedReplicas++;
}
} else {
- log.info("create jetty {} in directory {} of type {}", i, jettyDir, Replica.Type.PULL, ((currentI % sliceCount) + 1));
+ log.info("create jetty {} in directory {} of type {} for shard{}", i, jettyDir, Replica.Type.PULL, ((currentI % sliceCount) + 1));
customThreadPool.submit(() -> {
try {
JettySolrRunner j = createJetty(jettyDir, useJettyDataDir ? getDataDir(testDir + "/jetty"