You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2016/09/16 12:33:56 UTC
lucene-solr:branch_6x: SOLR-9507: Correctly set MDC values for
CoreContainer threads
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x e55b6f499 -> 8352ff21c
SOLR-9507: Correctly set MDC values for CoreContainer threads
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8352ff21
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8352ff21
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8352ff21
Branch: refs/heads/branch_6x
Commit: 8352ff21cd3a21db5174b6e7af4b00fd2d373d5b
Parents: e55b6f4
Author: Alan Woodward <ro...@apache.org>
Authored: Fri Sep 16 13:33:07 2016 +0100
Committer: Alan Woodward <ro...@apache.org>
Committed: Fri Sep 16 13:33:51 2016 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
solr/core/src/java/org/apache/solr/core/CoreContainer.java | 2 ++
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8352ff21/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 037eb4e..e841845 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -99,6 +99,9 @@ Bug Fixes
* SOLR-9484: The modify collection API should wait for the modified properties to show up in the
cluster state. (Cao Manh Dat, shalin)
+* SOLR-9507: CoreContainer threads now correctly set their MDC logging values
+ (Alan Woodward)
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8352ff21/solr/core/src/java/org/apache/solr/core/CoreContainer.java
----------------------------------------------------------------------
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 16dce9c..9974213 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -437,6 +437,8 @@ public class CoreContainer {
zkSys.initZooKeeper(this, solrHome, cfg.getCloudConfig());
if(isZooKeeperAware()) pkiAuthenticationPlugin = new PKIAuthenticationPlugin(this, zkSys.getZkController().getNodeName());
+ MDCLoggingContext.setNode(this);
+
ZkStateReader.ConfigData securityConfig = isZooKeeperAware() ? getZkController().getZkStateReader().getSecurityProps(false) : new ZkStateReader.ConfigData(EMPTY_MAP, -1);
initializeAuthorizationPlugin((Map<String, Object>) securityConfig.data.get("authorization"));
initializeAuthenticationPlugin((Map<String, Object>) securityConfig.data.get("authentication"));