Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-16559: Fix benchmark module warnings/errors

Kevin Risden071792187dba
diff --git a/solr/benchmark/build.gradle b/solr/benchmark/build.gradle
index 8575d36dc0f..6a651a4309e 100644
--- a/solr/benchmark/build.gradle
+++ b/solr/benchmark/build.gradle
@@ -57,6 +57,6 @@ dependencies {
implementation 'org.quicktheories:quicktheories'
implementation 'org.openjdk.jmh:jmh-core'
implementation 'org.slf4j:slf4j-api'
+ runtimeOnly 'com.lmax:disruptor'
annotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess'
- implementation 'org.slf4j:slf4j-api'
}
diff --git a/solr/benchmark/log4j2-bench.xml b/solr/benchmark/log4j2-bench.xml
index 99c0903c7dc..29db12fc23b 100644
--- a/solr/benchmark/log4j2-bench.xml
+++ b/solr/benchmark/log4j2-bench.xml
@@ -64,20 +64,22 @@
</RollingRandomAccessFile>
- <RandomAccessFile
+ <RollingRandomAccessFile
name="RandomCountsFile"
- fileName="${sys:solr.log.dir:-build/work/solr-logs}/${sys:solr.log.name:-solr}_random_counts.log">
+ fileName="${sys:solr.log.dir:-work/solr-logs}/${sys:solr.log.name:-solr}_random_counts.log"
+ filePattern="${sys:solr.log.dir:-work/solr-logs}/${sys:solr.log.name:-solr}_random_counts.log.%i">
<PatternLayout>
<Pattern>
%maxLen{%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%notEmpty{c:%X{collection}}%notEmpty{ s:%X{shard}}%notEmpty{ r:%X{replica}}%notEmpty{ x:%X{core}}] %c{1.}
%m%notEmpty{ =>%ex{short}}}{10240}%n
</Pattern>
</PatternLayout>
- </RandomAccessFile>
- <AsyncLogger name="org.apache.solr.bench.BaseBenchState.RandomCounts" level="info" additivity="false">
- <AppenderRef ref="RandomCountsFile"/>
- </AsyncLogger>
-
+ <Policies>
+ <OnStartupTriggeringPolicy/>
+ <SizeBasedTriggeringPolicy size="128 MB"/>
+ </Policies>
+ <DefaultRolloverStrategy max="10"/>
+ </RollingRandomAccessFile>
</Appenders>
<Loggers>
<!-- Use <AsyncLogger/<AsyncRoot and <Logger/<Root for asynchronous logging or synchonous logging respectively -->
@@ -92,6 +94,9 @@
<AsyncLogger name="org.apache.solr.core.SolrCore.SlowRequest" level="info" additivity="false">
<AppenderRef ref="SlowLogFile"/>
</AsyncLogger>
+ <AsyncLogger name="org.apache.solr.bench.BaseBenchState.RandomCounts" level="info" additivity="false">
+ <AppenderRef ref="RandomCountsFile"/>
+ </AsyncLogger>
<AsyncRoot level="info">
<AppenderRef ref="MainLogFile"/>