You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by va...@apache.org on 2018/03/26 18:32:14 UTC
lucene-solr:master: SOLR-7887: Log4J2 upgrade fixes
Repository: lucene-solr
Updated Branches:
refs/heads/master df9b88443 -> bea6e2307
SOLR-7887: Log4J2 upgrade fixes
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/bea6e230
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/bea6e230
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/bea6e230
Branch: refs/heads/master
Commit: bea6e2307b92437085d45287ec15fd04e0e15c66
Parents: df9b884
Author: Varun Thacker <va...@apache.org>
Authored: Mon Mar 26 11:20:21 2018 -0700
Committer: Varun Thacker <va...@apache.org>
Committed: Mon Mar 26 11:32:03 2018 -0700
----------------------------------------------------------------------
dev-tools/eclipse/run-solr-cloud.launch | 2 +-
dev-tools/eclipse/run-solr.launch | 2 +-
solr/CHANGES.txt | 10 +++++-----
solr/bin/solr.cmd | 2 +-
solr/contrib/ltr/src/test-files/log4j2.xml | 1 -
solr/contrib/prometheus-exporter/bin/solr-exporter | 2 +-
solr/contrib/prometheus-exporter/bin/solr-exporter.cmd | 2 +-
solr/contrib/prometheus-exporter/ivy.xml | 2 +-
.../solr/client/solrj/embedded/JettySolrRunner.java | 2 +-
solr/example/resources/log4j2.xml | 7 ++++---
solr/server/resources/log4j2.xml | 7 ++++---
solr/server/scripts/cloud-scripts/log4j2.xml | 2 +-
solr/solr-ref-guide/src/configuring-logging.adoc | 2 +-
solr/solrj/src/test-files/log4j2.xml | 2 +-
solr/test-framework/src/test-files/log4j2.xml | 2 +-
15 files changed, 24 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bea6e230/dev-tools/eclipse/run-solr-cloud.launch
----------------------------------------------------------------------
diff --git a/dev-tools/eclipse/run-solr-cloud.launch b/dev-tools/eclipse/run-solr-cloud.launch
index 493cb75..c9d5dbb 100644
--- a/dev-tools/eclipse/run-solr-cloud.launch
+++ b/dev-tools/eclipse/run-solr-cloud.launch
@@ -16,5 +16,5 @@
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.jetty.start.Main"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--module=http"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@ECLIPSEPROJECTNAME@"/>
- <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m -Djetty.port=8983 -DSTOP.PORT=7983 -DSTOP.KEY=solrrock -Dlog4j.configuration="file:${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server/resources/log4j.properties" -Djetty.home="${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server" -Djetty.base="${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server" -Dsolr.log="${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build" -Dsolr.log.dir="${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build" -Dsolr.solr.home="${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server/solr" -DzkRun"/>
+ <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m -Djetty.port=8983 -DSTOP.PORT=7983 -DSTOP.KEY=solrrock -Dlog4j.configurationFile="file:${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server/resources/log4j2.xml" -Djetty.home="${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server" -Djetty.base="${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server" -Dsolr.log="${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build" -Dsolr.log.dir="${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build" -Dsolr.solr.home="${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server/solr" -DzkRun"/>
</launchConfiguration>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bea6e230/dev-tools/eclipse/run-solr.launch
----------------------------------------------------------------------
diff --git a/dev-tools/eclipse/run-solr.launch b/dev-tools/eclipse/run-solr.launch
index dc167d0..00f225d 100644
--- a/dev-tools/eclipse/run-solr.launch
+++ b/dev-tools/eclipse/run-solr.launch
@@ -16,5 +16,5 @@
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.jetty.start.Main"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--module=http"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@ECLIPSEPROJECTNAME@"/>
- <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m -Djetty.port=8983 -DSTOP.PORT=7983 -DSTOP.KEY=solrrock -Dlog4j.configuration="file:${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server/resources/log4j.properties" -Djetty.home="${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server" -Djetty.base="${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server" -Dsolr.log="${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build" -Dsolr.log.dir="${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build" -Dsolr.solr.home="${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server/solr""/>
+ <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m -Djetty.port=8983 -DSTOP.PORT=7983 -DSTOP.KEY=solrrock -Dlog4j.configurationFile="file:${workspace_loc:@ECLIPSEPROJECTNAME@}/solr/server/resources/log4j2.xml" -Djetty.home="${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server" -Djetty.base="${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server" -Dsolr.log="${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build" -Dsolr.log.dir="${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build" -Dsolr.solr.home="${workspace_loc:@ECLIPSEPROJECTNAME@}/eclipse-build/solr-server/solr""/>
</launchConfiguration>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bea6e230/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 865fecf..33525c5 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -52,6 +52,8 @@ Jetty 9.4.8.v20171121
Upgrade Notes
----------------------
+* SOLR-7887: Solr now uses Log4J 2.11. The log4j configuration is now in log4j2.xml rather than lo4j.properties files
+
New Features
----------------------
@@ -61,6 +63,9 @@ New Features
* SOLR-12015: Add support "add-distinct" in AtomicURP so that we can use the 'add-distict' as a request parameter e.g:
atomic.<multival-field-name>=add-distict (Amrit Sarkar via noble)
+* SOLR-7887: Upgrade Solr to use Log4J 2.11
+ (Tim Potter, Keith Laban, Shawn Heisey, Ralph Goers, Erick Erickson, Varun Thacker)
+
Bug Fixes
----------------------
@@ -166,9 +171,6 @@ Upgrade Notes
from the earlier default of 30 seconds. This affects how soon Solr adds new replicas to replace the replicas
on nodes which have either crashed or shutdown.
-* SOLR-7887: Solr now uses Log4J 2.10. The log4j configuration is now in log4j2.xml rather than lo4j.properties
- files (Shawn Heisey, Keith Laban, Timothy Potter, Varun Thacker, Erick Erickson,
-
New Features
----------------------
* SOLR-11285: Simulation framework for autoscaling. (ab)
@@ -492,8 +494,6 @@ Other Changes
* SOLR-12097: Document the diskType policy attribute and usage of disk space in Collection APIs.
(Cassandra Targett, shalin)
-* SOLR-7887: Upgrade Solr to Log4J 2.10 (Tim Potter, Keith Laban, Shawn Heisey, Ralph Goers, Varun Thacker)
-
================== 7.2.1 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bea6e230/solr/bin/solr.cmd
----------------------------------------------------------------------
diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index ab32d23..35e6ae9 100644
--- a/solr/bin/solr.cmd
+++ b/solr/bin/solr.cmd
@@ -1366,7 +1366,7 @@ goto done
:run_config
"%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
- -Dlog4j.configuration="file:%DEFAULT_SERVER_DIR%\scripts\cloud-scripts\log4j2.xml" ^
+ -Dlog4j.configurationFile="file:%DEFAULT_SERVER_DIR%\scripts\cloud-scripts\log4j2.xml" ^
-classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
org.apache.solr.util.SolrCLI %*
if errorlevel 1 (
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bea6e230/solr/contrib/ltr/src/test-files/log4j2.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test-files/log4j2.xml b/solr/contrib/ltr/src/test-files/log4j2.xml
index 5acf4d0..b4678c1 100644
--- a/solr/contrib/ltr/src/test-files/log4j2.xml
+++ b/solr/contrib/ltr/src/test-files/log4j2.xml
@@ -31,7 +31,6 @@
<Logger name="org.apache.hadoop" level="WARN"/>
<Logger name="org.apache.directory" level="WARN"/>
<Logger name="org.apache.solr.hadoop" level="INFO"/>
- <Logger name="log4j.logger.org.apache.solr.hadoop" level="INFO"/>
<Logger name="org.apache.solr.client.solrj.embedded.JettySolrRunner" level="DEBUG"/>
<Root level="INFO">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bea6e230/solr/contrib/prometheus-exporter/bin/solr-exporter
----------------------------------------------------------------------
diff --git a/solr/contrib/prometheus-exporter/bin/solr-exporter b/solr/contrib/prometheus-exporter/bin/solr-exporter
index bf28488..751e6c7 100755
--- a/solr/contrib/prometheus-exporter/bin/solr-exporter
+++ b/solr/contrib/prometheus-exporter/bin/solr-exporter
@@ -100,7 +100,7 @@ do
CLASSPATH="$CLASSPATH":"$JAR"
done
-EXTRA_JVM_ARGUMENTS="-Xmx512m -Dlog4j.configuration=file:"$BASEDIR"/conf/log4j.properties"
+EXTRA_JVM_ARGUMENTS="-Xmx512m -Dlog4j.configurationFile=file:"$BASEDIR"/conf/log4j2.xml"
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bea6e230/solr/contrib/prometheus-exporter/bin/solr-exporter.cmd
----------------------------------------------------------------------
diff --git a/solr/contrib/prometheus-exporter/bin/solr-exporter.cmd b/solr/contrib/prometheus-exporter/bin/solr-exporter.cmd
index 05d8275..8fa4f60 100644
--- a/solr/contrib/prometheus-exporter/bin/solr-exporter.cmd
+++ b/solr/contrib/prometheus-exporter/bin/solr-exporter.cmd
@@ -69,7 +69,7 @@ if "%JAVACMD%"=="" set JAVACMD=java
if "%REPO%"=="" set REPO=%BASEDIR%\lib
set CLASSPATH="%CLASSPATH%";"%REPO%\*;%BASEDIR%\..\..\dist\solrj-lib\*;%BASEDIR%\..\..\dist\solr-core-*;%BASEDIR%\..\..\dist\solr-solrj-*;%BASEDIR%\..\..\dist\solr-prometheus-exporter-*;%BASEDIR%\lib\*"
-set EXTRA_JVM_ARGUMENTS=-Xmx512m -Dlog4j.configuration=file:%BASEDIR%/conf/log4j.properties
+set EXTRA_JVM_ARGUMENTS=-Xmx512m -Dlog4j.configurationFile=file:%BASEDIR%/conf/log4j2.xml
goto endInit
@REM Reaching here means variables are defined and arguments have been captured
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bea6e230/solr/contrib/prometheus-exporter/ivy.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/prometheus-exporter/ivy.xml b/solr/contrib/prometheus-exporter/ivy.xml
index 2c67825..7d62a3e 100644
--- a/solr/contrib/prometheus-exporter/ivy.xml
+++ b/solr/contrib/prometheus-exporter/ivy.xml
@@ -32,7 +32,7 @@
<dependency org="net.thisptr" name="jackson-jq" rev="${/net.thisptr/jackson-jq}" conf="compile"/>
<dependency org="net.sourceforge.argparse4j" name="argparse4j" rev="${/net.sourceforge.argparse4j/argparse4j}" conf="compile"/>
<dependency org="org.slf4j" name="slf4j-api" rev="${/org.slf4j/slf4j-api}" conf="compile"/>
- <dependency org="org.apache.logging.log4j" name="log4j-slf4j-impl" rev="${/org.apache.logging.log4j/log4j-slf4j-impl}" conf="test"/>
+ <dependency org="org.apache.logging.log4j" name="log4j-slf4j-impl" rev="${/org.apache.logging.log4j/log4j-slf4j-impl}" conf="compile"/>
<dependency org="org.apache.logging.log4j" name="log4j-api" rev="${/org.apache.logging.log4j/log4j-api}" conf="compile"/>
<dependency org="org.apache.logging.log4j" name="log4j-core" rev="${/org.apache.logging.log4j/log4j-core}" conf="compile"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bea6e230/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
index 745341a..23a8dc1 100644
--- a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
+++ b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
@@ -363,7 +363,7 @@ public class JettySolrRunner {
*
* If the server has been started before, it will restart using the same port
*
- * @throws java.lang.Exception if an error occurs on startup
+ * @throws Exception if an error occurs on startup
*/
public void start() throws Exception {
start(true);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bea6e230/solr/example/resources/log4j2.xml
----------------------------------------------------------------------
diff --git a/solr/example/resources/log4j2.xml b/solr/example/resources/log4j2.xml
index c6267d4..ebb4029 100644
--- a/solr/example/resources/log4j2.xml
+++ b/solr/example/resources/log4j2.xml
@@ -27,8 +27,8 @@
</Console>
<RollingFile
name="RollingFile"
- fileName="${sys:solr.solr.home}/../logs/solr.log"
- filePattern="${sys:solr.solr.home}/../logs/solr.%i.log.gz" >
+ fileName="${sys:solr.log.dir}/solr.log"
+ filePattern="${sys:solr.log.dir}/solr.%i.log" >
<PatternLayout>
<Pattern>
%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; [%X{collection} %X{shard} %X{replica} %X{core}] %c; %m%n
@@ -36,8 +36,9 @@
</PatternLayout>
<Policies>
<OnStartupTriggeringPolicy />
- <SizeBasedTriggeringPolicy size="4 MB"/>
+ <SizeBasedTriggeringPolicy size="32 MB"/>
</Policies>
+ <DefaultRolloverStrategy max="10"/>
</RollingFile>
</Appenders>
<Loggers>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bea6e230/solr/server/resources/log4j2.xml
----------------------------------------------------------------------
diff --git a/solr/server/resources/log4j2.xml b/solr/server/resources/log4j2.xml
index c8b162a..85ac230 100644
--- a/solr/server/resources/log4j2.xml
+++ b/solr/server/resources/log4j2.xml
@@ -27,8 +27,8 @@
</Console>
<RollingFile
name="RollingFile"
- fileName="${sys:solr.solr.home}/../logs/solr.log"
- filePattern="${sys:solr.solr.home}/../logs/solr.%i.log.gz" >
+ fileName="${sys:solr.log.dir}/solr.log"
+ filePattern="${sys:solr.log.dir}/solr.%i.log" >
<PatternLayout>
<Pattern>
%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%X{collection} %X{shard} %X{replica} %X{core}] %c{1.} %m%n
@@ -36,8 +36,9 @@
</PatternLayout>
<Policies>
<OnStartupTriggeringPolicy />
- <SizeBasedTriggeringPolicy size="4 MB"/>
+ <SizeBasedTriggeringPolicy size="32 MB"/>
</Policies>
+ <DefaultRolloverStrategy max="10"/>
</RollingFile>
</Appenders>
<Loggers>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bea6e230/solr/server/scripts/cloud-scripts/log4j2.xml
----------------------------------------------------------------------
diff --git a/solr/server/scripts/cloud-scripts/log4j2.xml b/solr/server/scripts/cloud-scripts/log4j2.xml
index b06ed81..bd90f77 100644
--- a/solr/server/scripts/cloud-scripts/log4j2.xml
+++ b/solr/server/scripts/cloud-scripts/log4j2.xml
@@ -28,7 +28,7 @@
</Appenders>
<Loggers>
<Logger name="org.apache.zookeeper" level="WARN"/>
- <Logger name="log4j.logger.org.apache.solr.common.cloud" level="WARN"/>
+ <Logger name="org.apache.solr.common.cloud" level="WARN"/>
<Root level="INFO">
<AppenderRef ref="STDERR"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bea6e230/solr/solr-ref-guide/src/configuring-logging.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/configuring-logging.adoc b/solr/solr-ref-guide/src/configuring-logging.adoc
index 15e47c9..af8db27 100644
--- a/solr/solr-ref-guide/src/configuring-logging.adoc
+++ b/solr/solr-ref-guide/src/configuring-logging.adoc
@@ -84,7 +84,7 @@ bin/solr start -f -q
== Permanent Logging Settings
-Solr uses http://logging.apache.org/log4j/{ivy-log4j-version}/[Log4J version {ivy-log4j-version}] for logging which is configured using `server/resources/log4j.properties`. Take a moment to inspect the contents of the `log4j.properties` file so that you are familiar with its structure. By default, Solr log messages will be written to `SOLR_LOGS_DIR/solr.log`.
+Solr uses http://logging.apache.org/log4j/{ivy-log4j-version}/[Log4J version {ivy-log4j-version}] for logging which is configured using `server/resources/log4j2.xml`. Take a moment to inspect the contents of the `log4j2.xml` file so that you are familiar with its structure. By default, Solr log messages will be written to `SOLR_LOGS_DIR/solr.log`.
When you're ready to deploy Solr in production, set the variable `SOLR_LOGS_DIR` to the location where you want Solr to write log files, such as `/var/solr/logs`. You may also want to tweak `log4j2.xml`. Note that if you installed Solr as a service using the instructions provided in <<taking-solr-to-production.adoc#taking-solr-to-production,Taking Solr to Production>>, then see `/var/solr/log4j2.xml` instead of the default `server/resources` version.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bea6e230/solr/solrj/src/test-files/log4j2.xml
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test-files/log4j2.xml b/solr/solrj/src/test-files/log4j2.xml
index b5421a8..7d0ebf7 100644
--- a/solr/solrj/src/test-files/log4j2.xml
+++ b/solr/solrj/src/test-files/log4j2.xml
@@ -30,7 +30,7 @@
<Logger name="org.apache.zookeeper" level="WARN"/>
<Logger name="org.apache.hadoop" level="WARN"/>
<Logger name="org.apache.directory" level="WARN"/>
- <Logger name="log4j.logger.org.apache.solr.hadoop" level="INFO"/>
+ <Logger name="org.apache.solr.hadoop" level="INFO"/>
<Root level="INFO">
<AppenderRef ref="STDERR"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bea6e230/solr/test-framework/src/test-files/log4j2.xml
----------------------------------------------------------------------
diff --git a/solr/test-framework/src/test-files/log4j2.xml b/solr/test-framework/src/test-files/log4j2.xml
index b5421a8..7d0ebf7 100644
--- a/solr/test-framework/src/test-files/log4j2.xml
+++ b/solr/test-framework/src/test-files/log4j2.xml
@@ -30,7 +30,7 @@
<Logger name="org.apache.zookeeper" level="WARN"/>
<Logger name="org.apache.hadoop" level="WARN"/>
<Logger name="org.apache.directory" level="WARN"/>
- <Logger name="log4j.logger.org.apache.solr.hadoop" level="INFO"/>
+ <Logger name="org.apache.solr.hadoop" level="INFO"/>
<Root level="INFO">
<AppenderRef ref="STDERR"/>