This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new c4c943d SOLR-15936 Reduce unnecessary startup logging, such as SSL
warnings when SSL not in use (#578)
c4c943d is described below
commit c4c943dcf14f1f5f33f69393f6a0611067f03ca1
Author: Jan Høydahl <[email protected]>
AuthorDate: Wed Feb 2 12:48:26 2022 +0100
SOLR-15936 Reduce unnecessary startup logging, such as SSL warnings when
SSL not in use (#578)
(cherry picked from commit 6f475f86f3bc848e45ddc7d3f0fa5ba9ca2cc25f)
---
solr/CHANGES.txt | 2 ++
.../src/java/org/apache/solr/core/SolrXmlConfig.java | 2 +-
.../apache/solr/metrics/reporters/SolrJmxReporter.java | 4 ++--
solr/server/resources/log4j2-console.xml | 3 +++
solr/server/resources/log4j2.xml | 3 +++
.../apache/solr/client/solrj/impl/Http2SolrClient.java | 18 +++++++-----------
6 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 3246eda..be34fff 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -534,6 +534,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 Fixes
diff --git a/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java
b/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java
index abc065c..ccab8f4 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 one
MBeanServer 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.java
index 7aa9d3e..c2b6ad1 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 {
*/
@Override
public 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.xml
index 38677c3..c33c93c 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.xml
index 4ec2fa2..186e86b 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.java
index 26e9459..49bf7e6 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");
