SOLR-16044: SlowRequest logging disabled if SolrCore logger set to ER…

…ROR (#1907) (cherry picked from commit ca4692b)
apache · Sep 10, 2023 · 5d2d59a · 5d2d59a
1 parent 5cc252f
commit 5d2d59a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
@@ -102,6 +102,8 @@ Bug Fixes
 
 * SOLR-16955: Tracing v2 apis breaks SecurityConfHandler (Alex Deparvu, David Smiley)
 
+* SOLR-16044: SlowRequest logging is no longer disabled if SolrCore logger set to ERROR (janhoy, hossman)
+
 Dependency Upgrades
 ---------------------
 

diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -2901,7 +2901,7 @@ public void execute(SolrRequestHandler handler, SolrQueryRequest req, SolrQueryR
       }
 
       /* slowQueryThresholdMillis defaults to -1 in SolrConfig -- not enabled.*/
-      if (log.isWarnEnabled() && slowQueryThresholdMillis >= 0) {
+      if (slowLog.isWarnEnabled() && slowQueryThresholdMillis >= 0) {
         final long qtime = (long) (req.getRequestTimer().getTime());
         if (qtime >= slowQueryThresholdMillis) {
           slowLog.warn("slow: {}", rsp.getToLogAsString());

diff --git a/solr/core/src/java/org/apache/solr/jersey/PostRequestLoggingFilter.java b/solr/core/src/java/org/apache/solr/jersey/PostRequestLoggingFilter.java
@@ -101,7 +101,7 @@ public void filter(
         response.responseHeader.qTime);
 
     /* slowQueryThresholdMillis defaults to -1 in SolrConfig -- not enabled.*/
-    if (log.isWarnEnabled()
+    if (slowCoreRequestLogger.isWarnEnabled()
         && solrConfig != null
         && solrConfig.slowQueryThresholdMillis >= 0
         && response.responseHeader.qTime >= solrConfig.slowQueryThresholdMillis) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -102,6 +102,8 @@ Bug Fixes @@
     * SOLR-16955: Tracing v2 apis breaks SecurityConfHandler (Alex Deparvu, David Smiley)
+    * SOLR-16044: SlowRequest logging is no longer disabled if SolrCore logger set to ERROR (janhoy, hossman)
     Dependency Upgrades
     ---------------------
@@ Expand Down @@