You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2016/12/13 20:30:48 UTC
[41/42] lucene-solr:feature/metrics: SOLR:9823: CoreContainer
incorrectly setting MDCLoggingContext for core
SOLR:9823: CoreContainer incorrectly setting MDCLoggingContext for core
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8c79ab26
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8c79ab26
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8c79ab26
Branch: refs/heads/feature/metrics
Commit: 8c79ab2649437c8c7ca275f6481c058c67626660
Parents: fecbbe0
Author: Erick <er...@apache.org>
Authored: Mon Dec 12 18:43:30 2016 -0800
Committer: Erick <er...@apache.org>
Committed: Mon Dec 12 18:43:30 2016 -0800
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
solr/core/src/java/org/apache/solr/core/CoreContainer.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8c79ab26/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index a8a3f97..41af0ff 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -242,6 +242,8 @@ Bug Fixes
* SOLR-9707: Don't forward DeleteByQuery requests to down replicas. (Jessica Cheng Mallet via Varun Thacker)
+* SOLR-9823: CoreContainer incorrectly setting MDCLoggingContext for core (Jessica Cheng Mallet via Erick Erickson)
+
Other Changes
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8c79ab26/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 ad4560e..7c38b81 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -857,7 +857,7 @@ public class CoreContainer {
SolrCore core = null;
try {
- MDCLoggingContext.setCore(core);
+ MDCLoggingContext.setCoreDescriptor(dcore);
SolrIdentifierValidator.validateCoreName(dcore.getName());
if (zkSys.getZkController() != null) {
zkSys.getZkController().preRegister(dcore);