Apache Solr open-source search software
Logging: don't log at info for some uninteresting events (#4667)
David Smiley3c8d56720c20
diff --git a/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java b/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.javaindex 3bbb010f486..9557d3e7e47 100644--- a/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java+++ b/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java@@ -167,20 +167,11 @@ public class SolrZkServer {},"embeddedZkServer");- if (zkProps.getServers().size() > 1) {- if (log.isInfoEnabled()) {- log.info(- "STARTING EMBEDDED ENSEMBLE ZOOKEEPER SERVER at port {}, listening on host {}",- zkProps.getClientPortAddress().getPort(),- zkProps.getClientPortAddress().getAddress().getHostAddress());- }- } else {- if (log.isInfoEnabled()) {- log.info(- "STARTING EMBEDDED ENSEMBLE ZOOKEEPER SERVER at port {}, listening on host {}",- zkProps.getClientPortAddress().getPort(),- zkProps.getClientPortAddress().getAddress().getHostAddress());- }+ if (log.isInfoEnabled()) {+ log.info(+ "STARTING EMBEDDED ENSEMBLE ZOOKEEPER SERVER at {}:{}",+ zkProps.getClientPortAddress().getAddress().getHostAddress(),+ zkProps.getClientPortAddress().getPort());}zkThread.setDaemon(true);diff --git a/solr/core/src/java/org/apache/solr/core/SolrConfig.java b/solr/core/src/java/org/apache/solr/core/SolrConfig.javaindex b5358755d1f..60362f4a113 100644--- a/solr/core/src/java/org/apache/solr/core/SolrConfig.java+++ b/solr/core/src/java/org/apache/solr/core/SolrConfig.java@@ -230,7 +230,9 @@ public class SolrConfig implements MapWriter {.txt();luceneMatchVersion = SolrConfig.parseLuceneVersionString(val);- log.info("Using Lucene MatchVersion: {}", luceneMatchVersion);+ if (!luceneMatchVersion.equals(Version.LATEST)) {+ log.info("Using Lucene MatchVersion: {}", luceneMatchVersion);+ }String indexConfigPrefix;diff --git a/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java b/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.javaindex 456106d0c87..206c7995e49 100644--- a/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java+++ b/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java@@ -227,8 +227,7 @@ public class SolrResourceLoaderif (log.isInfoEnabled()) {log.info(- "Added {} libs to classloader, from paths: {}",- urls.size(),+ "Added lib dirs to classloader: {}",urls.stream().map(u -> u.getPath().substring(0, u.getPath().lastIndexOf('/'))).sorted()diff --git a/solr/core/src/java/org/apache/solr/jersey/SolrRequestAuthorizer.java b/solr/core/src/java/org/apache/solr/jersey/SolrRequestAuthorizer.javaindex 1a96f534310..867e912bf06 100644--- a/solr/core/src/java/org/apache/solr/jersey/SolrRequestAuthorizer.java+++ b/solr/core/src/java/org/apache/solr/jersey/SolrRequestAuthorizer.java@@ -49,10 +49,6 @@ public class SolrRequestAuthorizer implements ContainerRequestFilter {@Context private ResourceInfo resourceInfo;- public SolrRequestAuthorizer() {- log.info("Creating a new SolrRequestAuthorizer");- }-@SuppressWarnings("unchecked")@Overridepublic void filter(ContainerRequestContext requestContext) throws IOException {diff --git a/solr/core/src/java/org/apache/solr/metrics/OtelRuntimeJvmMetrics.java b/solr/core/src/java/org/apache/solr/metrics/OtelRuntimeJvmMetrics.javaindex a9c14bab226..ab024789c58 100644--- a/solr/core/src/java/org/apache/solr/metrics/OtelRuntimeJvmMetrics.java+++ b/solr/core/src/java/org/apache/solr/metrics/OtelRuntimeJvmMetrics.java@@ -52,7 +52,10 @@ public class OtelRuntimeJvmMetrics {+ " gauges; guarded by instanceof check so gracefully absent on non-HotSpot JVMs")public OtelRuntimeJvmMetrics initialize(SolrMetricManager solrMetricManager, String registryName) {- if (!isJvmMetricsEnabled()) return this;+ if (!isJvmMetricsEnabled()) {+ log.info("JVM metrics are disabled"); // log because this isn't a default+ return this;+ }// a dummy instance; we only care to provide the MeterProvidervar otel =@@ -93,16 +96,13 @@ public class OtelRuntimeJvmMetrics {if (free >= 0) measurement.record(free, Attributes.of(STATE_KEY_ATTR, "free"));},OtelUnit.BYTES);- log.info("Physical memory metrics enabled");+ log.debug("Physical memory metrics enabled");} else {- if (log.isDebugEnabled()) {- log.debug(- "Physical memory metrics unavailable:"- + " com.sun.management.OperatingSystemMXBean not present on this JVM");- }+ log.info(+ "Physical memory metrics unavailable:"+ + " com.sun.management.OperatingSystemMXBean not present on this JVM");}isInitialized = true;- log.info("JVM metrics collection successfully initialized");return this;}diff --git a/solr/core/src/java/org/apache/solr/schema/IndexSchema.java b/solr/core/src/java/org/apache/solr/schema/IndexSchema.javaindex 05ee9e22869..3980483fb7e 100644--- a/solr/core/src/java/org/apache/solr/schema/IndexSchema.java+++ b/solr/core/src/java/org/apache/solr/schema/IndexSchema.java@@ -510,19 +510,6 @@ public class IndexSchema {try {rootNode = is.get();name = rootNode.attributes().get("name");- StringBuilder sb = new StringBuilder();- // Another case where the initialization from the test harness is different than the "real- // world"- if (name == null) {- sb.append("schema has no name!");- log.warn("{}", sb);- } else {- sb.append("Schema ");- sb.append(NAME);- sb.append("=");- sb.append(name);- log.info("{}", sb);- }version = Float.parseFloat(rootNode.attributes().getOrDefault("version", "1.0f"));diff --git a/solr/core/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.java b/solr/core/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.javaindex 7ac64e86a23..acbb8828316 100644--- a/solr/core/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.java+++ b/solr/core/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.java@@ -106,7 +106,7 @@ public class DirectSolrSpellChecker extends SolrSpellChecker {SolrParams params = config.toSolrParams();- log.info("init: {}", config);+ log.debug("init: {}", config);String name = super.init(config, core);Comparator<SuggestWord> comp = SuggestWordQueue.DEFAULT_COMPARATOR;diff --git a/solr/core/src/java/org/apache/solr/update/UpdateHandler.java b/solr/core/src/java/org/apache/solr/update/UpdateHandler.javaindex 831b22b41c8..abb76cb3dbe 100644--- a/solr/core/src/java/org/apache/solr/update/UpdateHandler.java+++ b/solr/core/src/java/org/apache/solr/update/UpdateHandler.java@@ -165,8 +165,8 @@ public abstract class UpdateHandler implements SolrInfoBean {? dirFactory.newDefaultUpdateLog(): core.getResourceLoader().newInstance(ulogPluginInfo, UpdateLog.class, true);- if (log.isInfoEnabled()) {- log.info("Using UpdateLog implementation: {}", ulog.getClass().getName());+ if (log.isDebugEnabled()) {+ log.debug("Using UpdateLog implementation: {}", ulog.getClass().getName());}ulog.init(ulogPluginInfo);diff --git a/solr/server/solr/configsets/_default/conf/solrconfig.xml b/solr/server/solr/configsets/_default/conf/solrconfig.xmlindex 236304a74cb..dbb1924c44b 100644--- a/solr/server/solr/configsets/_default/conf/solrconfig.xml+++ b/solr/server/solr/configsets/_default/conf/solrconfig.xml@@ -476,23 +476,19 @@<!-- QuerySenderListener takes an array of NamedList and executes alocal query request for each NamedList in sequence.-->+ <!--<listener event="newSearcher" class="solr.QuerySenderListener"><arr name="queries">- <!--- <lst><str name="q">solr</str><str name="sort">price asc</str></lst>- <lst><str name="q">rocks</str><str name="sort">weight asc</str></lst>- -->+ <lst><str name="q">solr</str><str name="sort">price asc</str></lst>+ <lst><str name="q">rocks</str><str name="sort">weight asc</str></lst></arr></listener><listener event="firstSearcher" class="solr.QuerySenderListener"><arr name="queries">- <!--- <lst>- <str name="q">static firstSearcher warming in solrconfig.xml</str>- </lst>- -->+ <lst><str name="q">static firstSearcher warming in solrconfig.xml</str></lst></arr></listener>+ --><!-- Use Cold Searcherdiff --git a/solr/server/solr/zoo.cfg b/solr/server/solr/zoo.cfgindex 393a2b13956..bb22f9772a3 100644--- a/solr/server/solr/zoo.cfg+++ b/solr/server/solr/zoo.cfg@@ -32,5 +32,8 @@ syncLimit=5# Set to "0" to disable auto purge feature#autopurge.purgeInterval=1+# 0 is ZK's default, means unlimited+maxCnxns=0+# Disable ZK AdminServer since we do not use itadmin.enableServer=false