You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2020/06/23 19:39:29 UTC
[lucene-solr] branch branch_8x updated: SOLR-13268: Clean up any
test failures resulting from defaulting to async logging
This is an automated email from the ASF dual-hosted git repository.
erick 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 de555f2 SOLR-13268: Clean up any test failures resulting from defaulting to async logging
de555f2 is described below
commit de555f2656c8af8deb71a7341dd4111c4d9596f1
Author: Erick Erickson <Er...@gmail.com>
AuthorDate: Tue Jun 23 15:39:16 2020 -0400
SOLR-13268: Clean up any test failures resulting from defaulting to async logging
---
solr/CHANGES.txt | 2 +
solr/core/src/test-files/log4j2.xml | 44 +++++----------------
solr/server/resources/log4j2-console.xml | 28 +------------
solr/server/resources/log4j2.xml | 67 +-------------------------------
solr/solrj/src/test-files/log4j2.xml | 45 +++++----------------
5 files changed, 24 insertions(+), 162 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 469f2ff..5b0c8af 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -289,6 +289,8 @@ Other Changes
* SOLR-14574: Fix or suppress warnings in solr/core/src/test (parts 1 and 2) (Erick Erickson)
+* SOLR-13268: Clean up any test failures resulting from defaulting to async logging (Erick Erickson)
+
================== 8.5.2 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
diff --git a/solr/core/src/test-files/log4j2.xml b/solr/core/src/test-files/log4j2.xml
index 46ad20c..de7954e 100644
--- a/solr/core/src/test-files/log4j2.xml
+++ b/solr/core/src/test-files/log4j2.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- Configuration for asynchronous logging -->
+<!-- We're configuring testing to be synchronous due to "logging polution", see SOLR-13268 -->
<Configuration>
<Appenders>
<Console name="STDERR" target="SYSTEM_ERR">
@@ -28,42 +28,16 @@
</Console>
</Appenders>
<Loggers>
- <AsyncLogger name="org.apache.zookeeper" level="WARN"/>
- <AsyncLogger name="org.apache.hadoop" level="WARN"/>
- <AsyncLogger name="org.apache.directory" level="WARN"/>
- <AsyncLogger name="org.apache.solr.hadoop" level="INFO"/>
- <AsyncLogger name="org.eclipse.jetty" level="INFO"/>
+ <!-- Use <AsyncLogger/<AsyncRoot and <Logger/<Root for asynchronous logging or synchonous logging respectively -->
+ <Logger name="org.apache.zookeeper" level="WARN"/>
+ <Logger name="org.apache.hadoop" level="WARN"/>
+ <Logger name="org.apache.directory" level="WARN"/>
+ <Logger name="org.apache.solr.hadoop" level="INFO"/>
+ <Logger name="org.eclipse.jetty" level="INFO"/>
- <AsyncRoot level="INFO">
+ <Root level="INFO">
<AppenderRef ref="STDERR"/>
- </AsyncRoot>
+ </Root>
</Loggers>
</Configuration>
-<!-- Configuration for synchronous logging
- there _may_ be a very small window where log messages will not be flushed
- to the log file on abnormal shutdown. If even this risk is unacceptable, use
- the configuration below
--->
-<!--Configuration>
-<Appenders>
- <Console name="STDERR" target="SYSTEM_ERR">
- <PatternLayout>
- <Pattern>
- %-4r %-5p (%t) [%X{node_name} %X{collection} %X{shard} %X{replica} %X{core}] %c{1.} %m%n
- </Pattern>
- </PatternLayout>
- </Console>
-</Appenders>
-<Loggers>
- <Logger name="org.apache.zookeeper" level="WARN"/>
- <Logger name="org.apache.hadoop" level="WARN"/>
- <Logger name="org.apache.directory" level="WARN"/>
- <Logger name="org.apache.solr.hadoop" level="INFO"/>
- <Logger name="org.eclipse.jetty" level="INFO"/>
-
- <Root level="INFO">
- <AppenderRef ref="STDERR"/>
- </Root>
-</Loggers>
-</Configuration-->
diff --git a/solr/server/resources/log4j2-console.xml b/solr/server/resources/log4j2-console.xml
index e83edf9..923b018 100644
--- a/solr/server/resources/log4j2-console.xml
+++ b/solr/server/resources/log4j2-console.xml
@@ -18,7 +18,7 @@
<!-- Use this file for logging exlusively to the console, useful for
some development tasks. Should not be used for production -->
-<!-- Configuration for asynchronous logging -->
+<!-- Default production configuration is asnychronous logging -->
<Configuration>
<Appenders>
<Console name="STDERR" target="SYSTEM_ERR">
@@ -30,6 +30,7 @@
</Console>
</Appenders>
<Loggers>
+ <!-- Use <AsyncLogger/<AsyncRoot and <Logger/<Root for asynchronous logging or synchonous logging respectively -->
<AsyncLogger name="org.apache.zookeeper" level="WARN"/>
<AsyncLogger name="org.apache.hadoop" level="WARN"/>
@@ -40,28 +41,3 @@
</Configuration>
-<!-- Configuration for synchronous logging
- there _may_ be a very small window where log messages will not be flushed
- to the log file on abnormal shutdown. If even this risk is unacceptable, use
- the configuration below
--->
-<!--Configuration>
-<Appenders>
- <Console name="STDERR" target="SYSTEM_ERR">
- <PatternLayout>
- <Pattern>
- %-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; %c; %m%n
- </Pattern>
- </PatternLayout>
- </Console>
-</Appenders>
-<Loggers>
- <Logger name="org.apache.zookeeper" level="WARN"/>
- <Logger name="org.apache.hadoop" level="WARN"/>
-
- <Root level="INFO">
- <AppenderRef ref="STDERR"/>
- </Root>
-</Loggers>
-</Configuration-->
-
diff --git a/solr/server/resources/log4j2.xml b/solr/server/resources/log4j2.xml
index e76973d..61aa2cf 100644
--- a/solr/server/resources/log4j2.xml
+++ b/solr/server/resources/log4j2.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<!-- Configuration for asynchronous logging -->
+<!-- Default production configuration is asnychronous logging -->
<Configuration>
<Appenders>
@@ -62,6 +62,7 @@
</Appenders>
<Loggers>
+ <!-- Use <AsyncLogger/<AsyncRoot and <Logger/<Root for asynchronous logging or synchonous logging respectively -->
<AsyncLogger name="org.apache.hadoop" level="warn"/>
<AsyncLogger name="org.apache.solr.update.LoggingInfoStream" level="off"/>
<AsyncLogger name="org.apache.zookeeper" level="warn"/>
@@ -76,67 +77,3 @@
</Loggers>
</Configuration>
-<!-- Configuration for synchronous logging
- there _may_ be a very small window where log messages will not be flushed
- to the log file on abnormal shutdown. If even this risk is unacceptable, use
- the configuration below
--->
-<!--Configuration>
- <Appenders>
-
- <Console name="STDOUT" target="SYSTEM_OUT">
- <PatternLayout>
- <Pattern>
- %d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%X{collection} %X{shard} %X{replica} %X{core}] %c{1.} %m%n
- </Pattern>
- </PatternLayout>
- </Console>
-
- <RollingFile
- name="RollingFile"
- fileName="${sys:solr.log.dir}/solr.log"
- filePattern="${sys:solr.log.dir}/solr.log.%i" >
- <PatternLayout>
- <Pattern>
- %d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%X{collection} %X{shard} %X{replica} %X{core}] %c{1.} %m%n
- </Pattern>
- </PatternLayout>
- <Policies>
- <OnStartupTriggeringPolicy />
- <SizeBasedTriggeringPolicy size="32 MB"/>
- </Policies>
- <DefaultRolloverStrategy max="10"/>
- </RollingFile>
-
- <RollingFile
- name="SlowFile"
- fileName="${sys:solr.log.dir}/solr_slow_requests.log"
- filePattern="${sys:solr.log.dir}/solr_slow_requests.log.%i" >
- <PatternLayout>
- <Pattern>
- %d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%X{collection} %X{shard} %X{replica} %X{core}] %c{1.} %m%n
- </Pattern>
- </PatternLayout>
- <Policies>
- <OnStartupTriggeringPolicy />
- <SizeBasedTriggeringPolicy size="32 MB"/>
- </Policies>
- <DefaultRolloverStrategy max="10"/>
- </RollingFile>
-
- </Appenders>
- <Loggers>
- <Logger name="org.apache.hadoop" level="warn"/>
- <Logger name="org.apache.solr.update.LoggingInfoStream" level="off"/>
- <Logger name="org.apache.zookeeper" level="warn"/>
- <Logger name="org.apache.solr.core.SolrCore.SlowRequest" level="info" additivity="false">
- <AppenderRef ref="SlowFile"/>
- </Logger>
-
- <Root level="info">
- <AppenderRef ref="RollingFile"/>
- <AppenderRef ref="STDOUT"/>
- </Root>
- </Loggers>
-</Configuration-->
-
diff --git a/solr/solrj/src/test-files/log4j2.xml b/solr/solrj/src/test-files/log4j2.xml
index 73e4654..5795615 100644
--- a/solr/solrj/src/test-files/log4j2.xml
+++ b/solr/solrj/src/test-files/log4j2.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- Configuration for asynchronous logging -->
+<!-- We're configuring testing to be synchronous due to "logging polution", see SOLR-13268 -->
<Configuration>
<Appenders>
<Console name="STDERR" target="SYSTEM_ERR">
@@ -28,42 +28,15 @@
</Console>
</Appenders>
<Loggers>
- <AsyncLogger name="org.apache.zookeeper" level="WARN"/>
- <AsyncLogger name="org.apache.hadoop" level="WARN"/>
- <AsyncLogger name="org.apache.directory" level="WARN"/>
- <AsyncLogger name="org.apache.solr.hadoop" level="INFO"/>
- <AsyncLogger name="org.eclipse.jetty" level="INFO"/>
+ <!-- Use <AsyncLogger/<AsyncRoot and <Logger/<Root for asynchronous logging or synchonous logging respectively -->
+ <Logger name="org.apache.zookeeper" level="WARN"/>
+ <Logger name="org.apache.hadoop" level="WARN"/>
+ <Logger name="org.apache.directory" level="WARN"/>
+ <Logger name="org.apache.solr.hadoop" level="INFO"/>
+ <Logger name="org.eclipse.jetty" level="INFO"/>
- <AsyncRoot level="INFO">
+ <Root level="INFO">
<AppenderRef ref="STDERR"/>
- </AsyncRoot>
+ </Root>
</Loggers>
</Configuration>
-
- <!-- Configuration for synchronous logging
- there _may_ be a very small window where log messages will not be flushed
- to the log file on abnormal shutdown. If even this risk is unacceptable, use
- the configuration below
- -->
- <!--Configuration>
- <Appenders>
- <Console name="STDERR" target="SYSTEM_ERR">
- <PatternLayout>
- <Pattern>
- %-4r %-5p (%t) [%X{node_name} %X{collection} %X{shard} %X{replica} %X{core}] %c{1.} %m%n
- </Pattern>
- </PatternLayout>
- </Console>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.zookeeper" level="WARN"/>
- <Logger name="org.apache.hadoop" level="WARN"/>
- <Logger name="org.apache.directory" level="WARN"/>
- <Logger name="org.apache.solr.hadoop" level="INFO"/>
- <Logger name="org.eclipse.jetty" level="INFO"/>
-
- <Root level="INFO">
- <AppenderRef ref="STDERR"/>
- </Root>
- </Loggers>
- </Configuration-->