Apache Solr open-source search software
SOLR-15936 Reduce unnecessary startup logging, such as SSL warnings when SSL not in use (#578)
Jan Høydahl6f475f86f3bc
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex fd712d171b6..ed4f87e445e 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -557,6 +557,8 @@ and each individual module's jar will be included in its directory's lib/ folder* SOLR-15957: Add port and scraping information to Solr Prometheus startup logging. (Houston Putman)+* SOLR-15936: Reduce unnecessary startup logging, such as SSL warnings when SSL not in use (janhoy)+* SOLR-15777: Forbid useDocValuesAsStored for ICUCollationField (warn for luceneMatchVersion < 9.0.0). (Michael Gibney)Bug Fixesdiff --git a/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java b/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.javaindex abc065c2917..ccab8f45fc4 100644--- a/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java+++ b/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java@@ -659,7 +659,7 @@ public class SolrXmlConfig {// if there's an MBean server running but there was no JMX reporter then add a default oneMBeanServer mBeanServer = JmxUtil.findFirstMBeanServer();if (mBeanServer != null && !hasJmxReporter) {- log.info("MBean server found: {}, but no JMX reporters were configured - adding default JMX reporter.", mBeanServer);+ log.debug("MBean server found: {}, but no JMX reporters were configured - adding default JMX reporter.", mBeanServer);Map<String,Object> attributes = new HashMap<>();attributes.put("name", "default");attributes.put("class", SolrJmxReporter.class.getName());diff --git a/solr/core/src/java/org/apache/solr/metrics/reporters/SolrJmxReporter.java b/solr/core/src/java/org/apache/solr/metrics/reporters/SolrJmxReporter.javaindex 7aa9d3e7ec5..c2b6ad1db92 100644--- a/solr/core/src/java/org/apache/solr/metrics/reporters/SolrJmxReporter.java+++ b/solr/core/src/java/org/apache/solr/metrics/reporters/SolrJmxReporter.java@@ -108,7 +108,7 @@ public class SolrJmxReporter extends FilteringSolrMetricReporter {.build();reporter.start();started = true;- log.info("JMX monitoring for '{}' (registry '{}') enabled at server: {}", fullDomain, registryName, mBeanServer);+ log.debug("JMX monitoring for '{}' (registry '{}') enabled at server: {}", fullDomain, registryName, mBeanServer);}/**@@ -123,7 +123,7 @@ public class SolrJmxReporter extends FilteringSolrMetricReporter {*/@Overridepublic synchronized void close() {- log.info("Closing reporter {} for registry {}/{}", this, registryName, registry);+ log.debug("Closing reporter {} for registry {}/{}", this, registryName, registry);started = false;if (reporter != null) {reporter.close();diff --git a/solr/server/resources/log4j2-console.xml b/solr/server/resources/log4j2-console.xmlindex 38677c3b23c..c33c93c9327 100644--- a/solr/server/resources/log4j2-console.xml+++ b/solr/server/resources/log4j2-console.xml@@ -33,6 +33,9 @@<!-- Use <AsyncLogger/<AsyncRoot and <Logger/<Root for asynchronous logging or synchonous logging respectively --><AsyncLogger name="org.apache.zookeeper" level="ERROR"/><AsyncLogger name="org.apache.hadoop" level="WARN"/>+ <AsyncLogger name="org.eclipse.jetty.deploy" level="warn"/>+ <AsyncLogger name="org.eclipse.jetty.webapp" level="warn"/>+ <AsyncLogger name="org.eclipse.jetty.server.session" level="warn"/><AsyncRoot level="INFO"><AppenderRef ref="STDERR"/>diff --git a/solr/server/resources/log4j2.xml b/solr/server/resources/log4j2.xmlindex 4ec2fa2ecfb..186e86bd8cc 100644--- a/solr/server/resources/log4j2.xml+++ b/solr/server/resources/log4j2.xml@@ -74,6 +74,9 @@<AsyncLogger name="org.apache.solr.core.SolrCore.SlowRequest" level="info" additivity="false"><AppenderRef ref="SlowLogFile"/></AsyncLogger>+ <AsyncLogger name="org.eclipse.jetty.deploy" level="warn"/>+ <AsyncLogger name="org.eclipse.jetty.webapp" level="warn"/>+ <AsyncLogger name="org.eclipse.jetty.server.session" level="warn"/><AsyncRoot level="info"><AppenderRef ref="MainLogFile"/>diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.javaindex 26e94593815..49bf7e6944e 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java@@ -57,7 +57,6 @@ import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.request.V2Request;import org.apache.solr.client.solrj.util.Cancellable;import org.apache.solr.client.solrj.util.ClientUtils;-import org.apache.solr.client.solrj.util.Constants;import org.apache.solr.client.solrj.util.AsyncListener;import org.apache.solr.common.SolrException;import org.apache.solr.common.StringUtils;@@ -196,25 +195,22 @@ public class Http2SolrClient extends SolrClient {}SslContextFactory.Client sslContextFactory;- boolean ssl;+ boolean sslEnabled;if (builder.sslConfig == null) {- sslContextFactory = getDefaultSslContextFactory();- ssl = sslContextFactory.getTrustStore() != null || sslContextFactory.getTrustStorePath() != null;+ sslEnabled = System.getProperty("javax.net.ssl.keyStore") != null || System.getProperty("javax.net.ssl.trustStore") != null;+ sslContextFactory = sslEnabled ? getDefaultSslContextFactory() : null;} else {sslContextFactory = builder.sslConfig.createClientContextFactory();- ssl = true;+ sslEnabled = true;}- boolean sslOnJava8OrLower = ssl && !Constants.JRE_IS_MINIMUM_JAVA9;HttpClientTransport transport;- if (builder.useHttp1_1 || sslOnJava8OrLower) {- if (sslOnJava8OrLower && !builder.useHttp1_1) {- log.warn("Create Http2SolrClient with HTTP/1.1 transport since Java 8 or lower versions does not support SSL + HTTP/2");- } else {+ if (builder.useHttp1_1) {+ if (log.isDebugEnabled()) {log.debug("Create Http2SolrClient with HTTP/1.1 transport");}transport = new HttpClientTransportOverHTTP(2);- httpClient = new HttpClient(transport, sslContextFactory);+ httpClient = sslEnabled ? new HttpClient(transport, sslContextFactory) : new HttpClient(transport);if (builder.maxConnectionsPerHost != null) httpClient.setMaxConnectionsPerDestination(builder.maxConnectionsPerHost);} else {log.debug("Create Http2SolrClient with HTTP/2 transport");