You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by kr...@apache.org on 2022/11/28 18:07:44 UTC

[solr] 04/04: SOLR-16559: Fix benchmark module warnings/errors

This is an automated email from the ASF dual-hosted git repository.

krisden pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git

commit 0cc7159e0a6d2e5b55b5a2f0fb9fda6b3e6e8f6e
Author: Kevin Risden <kr...@apache.org>
AuthorDate: Tue Nov 22 13:22:48 2022 -0500

    SOLR-16559: Fix benchmark module warnings/errors
---
 solr/benchmark/build.gradle     |  2 +-
 solr/benchmark/log4j2-bench.xml | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

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"/>