You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ja...@apache.org on 2022/05/05 13:41:18 UTC
[solr] 02/02: SOLR-16181 Initialize the LogWatcher earlier in CoreContainer#load() (#543)
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 43fc5e4bb3c19fa10d09881f098794132527550d
Author: Jan Høydahl <ja...@users.noreply.github.com>
AuthorDate: Thu May 5 12:46:59 2022 +0200
SOLR-16181 Initialize the LogWatcher earlier in CoreContainer#load() (#543)
(cherry picked from commit 2cace80111908a33bfaed7a1fd57530ab2017e9b)
---
solr/CHANGES.txt | 2 ++
solr/core/src/java/org/apache/solr/core/CoreContainer.java | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index af9731cf18d..74fbb624a45 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -22,6 +22,8 @@ Improvements
* SOLR-15045: `DistributedZkUpdateProcessor` now issues commits to local shards and remote shards in parallel,
halving the latency of synchronous commits (Michael Gibney)
+* SOLR-16181: Initialize the LogWatcher earlier in CoreContainer#load() (janhoy)
+
Optimizations
---------------------
* SOLR-16120: Optimise hl.fl expansion. (Christine Poerschke, David Smiley, Mike Drob)
diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
index e30ca217bbf..b04f824597d 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -696,6 +696,8 @@ public class CoreContainer {
log.debug("Loading cores into CoreContainer [instanceDir={}]", getSolrHome());
}
+ logging = LogWatcher.newRegisteredLogWatcher(cfg.getLogWatcherConfig(), loader);
+
ClusterEventProducerFactory clusterEventProducerFactory = new ClusterEventProducerFactory(this);
clusterEventProducer = clusterEventProducerFactory;
@@ -733,8 +735,6 @@ public class CoreContainer {
solrCores.load(loader);
- logging = LogWatcher.newRegisteredLogWatcher(cfg.getLogWatcherConfig(), loader);
-
StartupLoggingUtils.checkRequestLogging();
hostName = cfg.getNodeName();